Feat: Dashboard tabs and repositioning. New processes view. Settings backend changes #158
@@ -11,8 +11,8 @@ import qs.Components
|
|||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
readonly property real nonAnimWidth: view.implicitWidth + clipWrapper.anchors.margins * 2
|
readonly property real nonAnimWidth: view.implicitWidth + viewWrapper.anchors.margins * 2
|
||||||
readonly property real nonAnimHeight: tabs.implicitHeight + tabs.anchors.topMargin + view.implicitHeight + clipWrapper.anchors.margins + clipWrapper.anchors.topMargin
|
readonly property real nonAnimHeight: tabs.implicitHeight + tabs.anchors.topMargin + view.implicitHeight + viewWrapper.anchors.margins + viewWrapper.anchors.topMargin
|
||||||
|
|
||||||
required property ScreenState screenState
|
required property ScreenState screenState
|
||||||
|
|
||||||
@@ -74,20 +74,18 @@ Item {
|
|||||||
anchors.margins: Tokens.padding.small
|
anchors.margins: Tokens.padding.small
|
||||||
}
|
}
|
||||||
|
|
||||||
CustomClippingRect {
|
Item {
|
||||||
id: clipWrapper
|
id: viewWrapper
|
||||||
|
|
||||||
|
property int radius: Tokens.rounding.extraLarge - anchors.margins
|
||||||
|
|
||||||
anchors.top: tabs.bottom
|
anchors.top: tabs.bottom
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.topMargin: Tokens.spacing.small
|
anchors.topMargin: Tokens.spacing.small
|
||||||
anchors.margins: Tokens.padding.small
|
anchors.margins: Tokens.padding.small
|
||||||
radius: Tokens.rounding.extraLarge - anchors.margins
|
clip: true
|
||||||
|
|
||||||
Item {
|
|
||||||
id: viewWrapper
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
|
|
||||||
Flickable {
|
Flickable {
|
||||||
id: view
|
id: view
|
||||||
@@ -156,13 +154,16 @@ Item {
|
|||||||
|
|
||||||
Dash {
|
Dash {
|
||||||
screenState: root.screenState
|
screenState: root.screenState
|
||||||
|
radius: viewWrapper.radius
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Component {
|
Component {
|
||||||
id: weatherComponent
|
id: weatherComponent
|
||||||
|
|
||||||
WeatherTab {}
|
WeatherTab {
|
||||||
|
radius: viewWrapper.radius
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Component {
|
Component {
|
||||||
@@ -170,13 +171,16 @@ Item {
|
|||||||
|
|
||||||
Media {
|
Media {
|
||||||
screenState: root.screenState
|
screenState: root.screenState
|
||||||
|
radius: viewWrapper.radius
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Component {
|
Component {
|
||||||
id: procsComponent
|
id: procsComponent
|
||||||
|
|
||||||
ProcessesTab {}
|
ProcessesTab {
|
||||||
|
radius: viewWrapper.radius
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Behavior on contentX {
|
Behavior on contentX {
|
||||||
@@ -187,4 +191,3 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ GridLayout {
|
|||||||
id: root
|
id: root
|
||||||
|
|
||||||
readonly property bool dashboardVisible: screenState.dashboard
|
readonly property bool dashboardVisible: screenState.dashboard
|
||||||
property int radius: Tokens.rounding.medium
|
required property int radius
|
||||||
required property ScreenState screenState
|
required property ScreenState screenState
|
||||||
|
|
||||||
columnSpacing: Tokens.spacing.small
|
columnSpacing: Tokens.spacing.small
|
||||||
|
|||||||
@@ -11,13 +11,19 @@ Item {
|
|||||||
id: root
|
id: root
|
||||||
|
|
||||||
property ScreenState screenState
|
property ScreenState screenState
|
||||||
|
required property int radius
|
||||||
|
|
||||||
implicitWidth: 1000
|
implicitWidth: 1000
|
||||||
implicitHeight: 320
|
implicitHeight: 320
|
||||||
|
|
||||||
|
CustomClippingRect {
|
||||||
|
anchors.fill: parent
|
||||||
|
radius: root.radius
|
||||||
|
|
||||||
BackgroundShapes {
|
BackgroundShapes {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ import qs.Services
|
|||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
|
required property int radius
|
||||||
|
|
||||||
implicitHeight: layout.implicitHeight
|
implicitHeight: layout.implicitHeight
|
||||||
|
|
||||||
ServiceRef {
|
ServiceRef {
|
||||||
@@ -53,7 +55,7 @@ Item {
|
|||||||
property list<var> values
|
property list<var> values
|
||||||
|
|
||||||
color: Colors.tPalette.m3surfaceContainer
|
color: Colors.tPalette.m3surfaceContainer
|
||||||
radius: Tokens.rounding.largeIncreased
|
radius: root.radius
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
implicitHeight: mainLayout.implicitHeight + mainLayout.anchors.margins * 2
|
implicitHeight: mainLayout.implicitHeight + mainLayout.anchors.margins * 2
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import qs.Services
|
|||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
|
required property int radius
|
||||||
|
|
||||||
implicitWidth: Tokens.sizes.dashboard.processesWidth
|
implicitWidth: Tokens.sizes.dashboard.processesWidth
|
||||||
implicitHeight: Tokens.sizes.dashboard.processesHeight
|
implicitHeight: Tokens.sizes.dashboard.processesHeight
|
||||||
|
|
||||||
@@ -47,5 +49,6 @@ Item {
|
|||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
radius: root.radius
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
pragma ComponentBehavior: Bound
|
||||||
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import ZShell.Config
|
import ZShell.Config
|
||||||
@@ -9,6 +11,7 @@ import qs.Helpers
|
|||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
|
required property int radius
|
||||||
readonly property var today: Weather.forecast && Weather.forecast.length > 0 ? Weather.forecast[0] : null
|
readonly property var today: Weather.forecast && Weather.forecast.length > 0 ? Weather.forecast[0] : null
|
||||||
|
|
||||||
implicitWidth: layout.implicitWidth > 800 ? layout.implicitWidth : 840
|
implicitWidth: layout.implicitWidth > 800 ? layout.implicitWidth : 840
|
||||||
@@ -136,7 +139,7 @@ Item {
|
|||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
implicitHeight: forecastItemColumn.implicitHeight + Tokens.padding.medium * 2
|
implicitHeight: forecastItemColumn.implicitHeight + Tokens.padding.medium * 2
|
||||||
|
|
||||||
radius: Tokens.rounding.large
|
radius: root.radius
|
||||||
color: Colors.tPalette.m3surfaceContainer
|
color: Colors.tPalette.m3surfaceContainer
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
|
|||||||
Reference in New Issue
Block a user