zach/z-bar-qt
1
1
Fork 0
Code Issues 23 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

fix: remove clippingrectangle in favor of passing radius to sub-items

Browse Source
This commit is contained in:
zach
2026-09-30 14:26:59 +02:00
parent 4a021d81ac
commit f6fa2f0230
6 changed files with 95 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Dashboard/Content.qml
+16 -13
View File
@@ -11,8 +11,8 @@ import qs.Components
Item {
id: root
readonly property real nonAnimWidth: view.implicitWidth + clipWrapper.anchors.margins * 2
readonly property real nonAnimHeight: tabs.implicitHeight + tabs.anchors.topMargin + view.implicitHeight + clipWrapper.anchors.margins + clipWrapper.anchors.topMargin
readonly property real nonAnimWidth: view.implicitWidth + viewWrapper.anchors.margins * 2
readonly property real nonAnimHeight: tabs.implicitHeight + tabs.anchors.topMargin + view.implicitHeight + viewWrapper.anchors.margins + viewWrapper.anchors.topMargin
required property ScreenState screenState
@@ -74,20 +74,18 @@ Item {
anchors.margins: Tokens.padding.small
}
CustomClippingRect {
id: clipWrapper
Item {
id: viewWrapper
property int radius: Tokens.rounding.extraLarge - anchors.margins
anchors.top: tabs.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.topMargin: Tokens.spacing.small
anchors.margins: Tokens.padding.small
radius: Tokens.rounding.extraLarge - anchors.margins
Item {
id: viewWrapper
anchors.fill: parent
clip: true
Flickable {
id: view
@@ -156,13 +154,16 @@ Item {
Dash {
screenState: root.screenState
radius: viewWrapper.radius
}
}
Component {
id: weatherComponent
WeatherTab {}
WeatherTab {
radius: viewWrapper.radius
}
}
Component {
@@ -170,13 +171,16 @@ Item {
Media {
screenState: root.screenState
radius: viewWrapper.radius
}
}
Component {
id: procsComponent
ProcessesTab {}
ProcessesTab {
radius: viewWrapper.radius
}
}
Behavior on contentX {
@@ -187,4 +191,3 @@ Item {
}
}
}
}
Modules/Dashboard/Dash.qml
+1 -1
View File
@@ -12,7 +12,7 @@ GridLayout {
id: root
readonly property bool dashboardVisible: screenState.dashboard
property int radius: Tokens.rounding.medium
required property int radius
required property ScreenState screenState
columnSpacing: Tokens.spacing.small
Modules/Dashboard/Media.qml
+6
View File
@@ -11,13 +11,19 @@ Item {
id: root
property ScreenState screenState
required property int radius
implicitWidth: 1000
implicitHeight: 320
CustomClippingRect {
anchors.fill: parent
radius: root.radius
BackgroundShapes {
anchors.fill: parent
}
}
RowLayout {
anchors.fill: parent
Modules/Dashboard/Processes/SystemInfo.qml
+3 -1
View File
@@ -11,6 +11,8 @@ import qs.Services
Item {
id: root
required property int radius
implicitHeight: layout.implicitHeight
ServiceRef {
@@ -53,7 +55,7 @@ Item {
property list<var> values
color: Colors.tPalette.m3surfaceContainer
radius: Tokens.rounding.largeIncreased
radius: root.radius
Layout.fillWidth: true
Layout.fillHeight: true
implicitHeight: mainLayout.implicitHeight + mainLayout.anchors.margins * 2
Modules/Dashboard/ProcessesTab.qml
+3
View File
@@ -9,6 +9,8 @@ import qs.Services
Item {
id: root
required property int radius
implicitWidth: Tokens.sizes.dashboard.processesWidth
implicitHeight: Tokens.sizes.dashboard.processesHeight
@@ -47,5 +49,6 @@ Item {
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
radius: root.radius
}
}
Modules/Dashboard/WeatherTab.qml
+4 -1
View File
@@ -1,3 +1,5 @@
pragma ComponentBehavior: Bound
import QtQuick
import QtQuick.Layouts
import ZShell.Config
@@ -9,6 +11,7 @@ import qs.Helpers
Item {
id: root
required property int radius
readonly property var today: Weather.forecast && Weather.forecast.length > 0 ? Weather.forecast[0] : null
implicitWidth: layout.implicitWidth > 800 ? layout.implicitWidth : 840
@@ -136,7 +139,7 @@ Item {
Layout.fillWidth: true
implicitHeight: forecastItemColumn.implicitHeight + Tokens.padding.medium * 2
radius: Tokens.rounding.large
radius: root.radius
color: Colors.tPalette.m3surfaceContainer
ColumnLayout {