WidgetBase for bar widget + fixed resources and dashboard popouts in left- and bottom-edge bar

2026-08-15 19:37:44 +02:00
parent 858ef68565
commit 5efa0de3a5
16 changed files with 357 additions and 235 deletions
@@ -6,19 +6,18 @@ import QtQuick.Layouts
 import ZShell.Config
 import ZShell.Services
 import qs.Services
-import qs.Modules
+import qs.Modules.Bar.Components.Common
 import qs.Components

-CustomRect {
+WidgetBase {
 	id: root

-	required property bool horizontal
 	required property PersistentProperties visibilities

 	clip: true
 	color: visibilities.resources ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
-	implicitHeight: horizontal ? Math.max(Config.bar.height, Tokens.bar.innerSize) : gridLayout.implicitHeight + Tokens.padding.normal * 2
-	implicitWidth: horizontal ? gridLayout.implicitWidth + Tokens.padding.larger * 2 : Math.max(Config.bar.height, Tokens.bar.innerSize)
+	implicitHeight: horizontal ? baseSize : gridLayout.implicitHeight + Tokens.padding.normal * 2
+	implicitWidth: horizontal ? gridLayout.implicitWidth + Tokens.padding.larger * 2 : baseSize
 	radius: Tokens.rounding.full

 	StateLayer {