Merge branch 'main' into module/wifi

Drawers/Drawing.qml

@@ -3,28 +3,23 @@ pragma ComponentBehavior: Bound
 import Quickshell
 import QtQuick
 import ZShell.Internal
+import qs.Components
 
 Item {
 	id: root
 
 	readonly property alias content: contentLoader.item
-	readonly property PersistentProperties drawingState: PersistentProperties {
-		property color penColor: "white"
-		property int penWidth: 4
-
-		reloadableId: "drawingState"
-	}
-	required property PersistentProperties visibilities
+	required property ScreenState screenState
 
 	Loader {
 		id: contentLoader
 
-		active: root.visibilities.isDrawing
+		active: root.screenState.isDrawing
 		anchors.fill: parent
 
 		sourceComponent: StrokeCanvas {
-			penColor: root.drawingState.penColor
-			penWidth: root.drawingState.penWidth
+			penColor: root.screenState.penColor
+			penWidth: root.screenState.penWidth
 		}
 	}
 }

Drawers/Interactions.qml

@@ -1,7 +1,7 @@
 import Quickshell
 import QtQuick
-import qs.Components
 import ZShell.Config
+import qs.Components
 import qs.Helpers
 import qs.Modules.Bar.Popouts
 
@@ -19,7 +19,7 @@ Item {
 	required property ShellScreen screen
 	property bool singleGestureTriggered: false
 	property bool utilitiesShortcutActive
-	required property PersistentProperties visibilities
+	required property ScreenState screenState
 
 	function inBottomPanel(panel: Item, x: real, y: real): bool {
 		const panelHeight = panel.height * (1 - (panel.offsetScale ?? 0));
@@ -63,7 +63,7 @@ Item {
 
 		cursorShape: (active && centroid.pressPosition.y < root.bar.implicitHeight) ? Qt.ClosedHandCursor : undefined
 		dragThreshold: 0
-		enabled: !root.visibilities.isDrawing
+		enabled: !root.screenState.isDrawing
 		grabPermissions: PointerHandler.CanTakeOverFromHandlersOfSameType | PointerHandler.ApprovesTakeOverByAnything
 		maximumPointCount: 1
 		minimumPointCount: 1
@@ -76,45 +76,59 @@ Item {
 		onCentroidChanged: {
 			const x = centroid.position.x;
 			const y = centroid.position.y;
-			const dragX = x - centroid.pressPosition.x;
-			const dragY = y - centroid.pressPosition.y;
+			const pressX = centroid.pressPosition.x;
+			const pressY = centroid.pressPosition.y;
+			const dragX = x - pressX;
+			const dragY = y - pressY;
 
-			if (centroid.pressPosition.y >= root.screen.height - Config.bar.border && centroid.pressPosition.x > root.screen.width / 5 && dragY < -Config.launcher.dragThreshold)
-				root.visibilities.launcher = true;
+			if (pressY >= root.screen.height - Config.bar.border && pressX > root.screen.width / 5 && dragY < -Config.launcher.dragThreshold)
+				root.screenState.launcher = true;
 
 			if (root.singleGestureTriggered)
 				return;
 
-			if (root.geometry.insetTop(root.borderThickness) > centroid.pressPosition.y) {
-				if (dragY > 20) {
-					root.visibilities.settings = true;
+			const inDashboard = root.inTopPanel(root.panels.dashboardWrapper, pressX, pressY);
+
+			if (inDashboard && root.withinPanelWidth(root.panels.dashboardWrapper, x, y)) {
+				if (dragY > Config.dashboard.dragThreshold) {
+					root.screenState.dashboard = true;
 					root.singleGestureTriggered = true;
-				} else if (dragY < -20) {
-					root.visibilities.settings = false;
+				} else if (dragY < -Config.dashboard.dragThreshold) {
+					root.screenState.dashboard = false;
 					root.singleGestureTriggered = true;
 				}
 			}
 
-			if (centroid.pressPosition.y > root.screen.height - root.geometry.insetBottom(root.borderThickness) && centroid.pressPosition.x < root.screen.width / 5 && dragY < -50)
-				root.visibilities.clipboard = true;
+			if (root.geometry.insetTop(root.borderThickness) > pressY && (Config.dashboard.showOnHover || !inDashboard)) {
+				if (dragY > 20) {
+					root.screenState.settings = true;
+					root.singleGestureTriggered = true;
+				} else if (dragY < -20) {
+					root.screenState.settings = false;
+					root.singleGestureTriggered = true;
+				}
+			}
 
-			if (!Config.dock.hoverToReveal && centroid.pressPosition.y > root.screen.height - root.geometry.insetTop(root.borderThickness) && centroid.pressPosition.x > root.screen.width / 5 && !root.visibilities.launcher)
+			if (pressY > root.screen.height - root.geometry.insetBottom(root.borderThickness) && pressX < root.screen.width / 5 && dragY < -50)
+				root.screenState.clipboard = true;
+
+			if (!Config.dock.hoverToReveal && pressY > root.screen.height - root.geometry.insetTop(root.borderThickness) && pressX > root.screen.width / 5 && !root.screenState.launcher)
 				if (dragY < -10) {
-					root.visibilities.dock = true;
+					root.screenState.dock = true;
 					root.singleGestureTriggered = true;
 				}
 
-			if (centroid.pressPosition.x > root.screen.width - Config.bar.border && centroid.pressPosition.y < (root.screen.height / 2) && dragX < -Config.sidebar.dragThreshold) {
-				root.visibilities.sidebar = true;
+			if (pressX > root.screen.width - Config.bar.border && pressY < (root.screen.height / 2) && dragX < -Config.sidebar.dragThreshold) {
+				root.screenState.sidebar = true;
 				root.singleGestureTriggered = true;
 			}
 
-			if (centroid.pressPosition.x >= root.screen.width - Config.bar.border && centroid.pressPosition.y > (root.screen.height / 2) && dragX < -20) {
+			if (pressX >= root.screen.width - Config.bar.border && pressY > (root.screen.height / 2) && dragX < -20) {
 				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r+1', on_current_monitor = true })`);
 				root.singleGestureTriggered = true;
 			}
 
-			if (centroid.pressPosition.x <= Config.bar.border && dragX > 20) {
+			if (pressX <= Config.bar.border && dragX > 20) {
 				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r-1', on_current_monitor = true })`);
 				root.singleGestureTriggered = true;
 			}
@@ -127,7 +141,7 @@ Item {
 		property bool setInitialPoint: false
 
 		acceptedButtons: Qt.LeftButton | Qt.RightButton
-		enabled: root.visibilities.isDrawing && (!root.inLeftPanel(root.panels.drawing, hoverHandler.point.position.x, hoverHandler.point.position.y) || !root.panels.drawing.expanded)
+		enabled: root.screenState.isDrawing && (!root.inLeftPanel(root.panels.drawing, hoverHandler.point.position.x, hoverHandler.point.position.y) || !root.panels.drawing.expanded)
 
 		onActiveChanged: {
 			if (!active) {
@@ -178,12 +192,12 @@ Item {
 	HoverHandler {
 		id: hoverHandler
 
-		cursorShape: root.visibilities.isDrawing && !root.inLeftPanel(root.panels.drawing, point.position.x, point.position.y) ? Qt.BlankCursor : undefined
+		cursorShape: root.screenState.isDrawing && !root.inLeftPanel(root.panels.drawing, point.position.x, point.position.y) ? Qt.BlankCursor : undefined
 
 		onHoveredChanged: {
 			if (!hovered) {
 				if (!root.osdShortcutActive) {
-					root.visibilities.osd = false;
+					root.screenState.osd = false;
 					root.panels.osd.hovered = false;
 				}
 
@@ -193,13 +207,16 @@ Item {
 
 				if (Config.bar.autoHide || root.bar.fullscreen)
 					root.bar.isHovered = false;
+
+				if (root.screenState.dashboard && Config.dashboard.showOnHover)
+					root.screenState.dashboard = false;
 			}
 		}
 		onPointChanged: {
 			const x = point.position.x;
 			const y = point.position.y;
 
-			if (root.visibilities.isDrawing) {
+			if (root.screenState.isDrawing) {
 				if (root.inLeftPanel(root.panels.drawing, x, y) && !(drawingHandler.point.pressedButtons & Qt.LeftButton)) {
 					root.panels.drawing.expand();
 					root.drawing.content.hideHover();
@@ -210,7 +227,7 @@ Item {
 				return;
 			}
 
-			if (!root.visibilities.bar && Config.bar.autoHide && root.geometry.barContains(x, y, true))
+			if (!root.screenState.bar && Config.bar.autoHide && root.geometry.barContains(x, y, true))
 				root.bar.isHovered = true;
 
 			if (root.bar.fullscreen && !root.bar.isHovered)
@@ -228,7 +245,7 @@ Item {
 				const showOsd = outOfSidebar && root.inRightPanel(root.panels.osdWrapper, x, y);
 
 				if (!root.osdShortcutActive) {
-					root.visibilities.osd = showOsd;
+					root.screenState.osd = showOsd;
 					root.panels.osd.hovered = showOsd;
 				} else if (showOsd) {
 					root.osdShortcutActive = false;
@@ -236,8 +253,13 @@ Item {
 				}
 			}
 
-			if (Config.dock.enabled && Config.dock.hoverToReveal && !root.visibilities.dock && !root.visibilities.launcher && root.inBottomPanel(root.panels.dock, x, y))
-				root.visibilities.dock = true;
+			if (Config.dock.enable && Config.dock.hoverToReveal && !root.screenState.dock && !root.screenState.launcher && root.inBottomPanel(root.panels.dock, x, y))
+				root.screenState.dock = true;
+
+			const inDashboard = root.inTopPanel(root.panels.dashboardWrapper, x, y);
+
+			if (Config.dashboard.showOnHover)
+				root.screenState.dashboard = inDashboard;
 
 			if (root.geometry.barContains(x, y))
 				root.bar.checkPopout(root.geometry.axisPos(x, y));
@@ -246,16 +268,17 @@ Item {
 
 	Connections {
 		function onDashboardChanged() {
-			if (root.visibilities.dashboard) {
+			if (root.screenState.dashboard) {
 				const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY);
 				if (!inDashboardArea) {
 					root.dashboardShortcutActive = true;
 				}
 				if (root.panels.launcher.x + root.panels.launcher.width > root.panels.dashboardWrapper.x)
-					root.visibilities.launcher = false;
+					root.screenState.launcher = false;
 
-				root.visibilities.settings = false;
-				root.visibilities.sidebar = false;
+				root.screenState.settings = false;
+				root.screenState.sidebar = false;
+				root.screenState.resources = false;
 				root.popouts.hasCurrent = false;
 			} else {
 				root.dashboardShortcutActive = false;
@@ -263,12 +286,12 @@ Item {
 		}
 
 		function onIsDrawingChanged() {
-			if (!root.visibilities.isDrawing)
+			if (!root.screenState.isDrawing)
 				root.drawing.clear();
 		}
 
 		function onLauncherChanged() {
-			if (!root.visibilities.launcher) {
+			if (!root.screenState.launcher) {
 				root.dashboardShortcutActive = false;
 				root.osdShortcutActive = false;
 				root.utilitiesShortcutActive = false;
@@ -276,23 +299,23 @@ Item {
 				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
 
 				if (!inOsdArea) {
-					root.visibilities.osd = false;
+					root.screenState.osd = false;
 					root.panels.osd.hovered = false;
 				}
 			}
 
-			if (root.visibilities.launcher) {
+			if (root.screenState.launcher) {
 				if (root.panels.dashboardWrapper.x < root.panels.launcher.x + root.panels.launcher.width) {
-					root.visibilities.dashboard = false;
+					root.screenState.dashboard = false;
 				}
 
-				root.visibilities.dock = false;
-				root.visibilities.settings = false;
+				root.screenState.dock = false;
+				root.screenState.settings = false;
 			}
 		}
 
 		function onOsdChanged() {
-			if (root.visibilities.osd) {
+			if (root.screenState.osd) {
 				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
 				if (!inOsdArea) {
 					root.osdShortcutActive = true;
@@ -303,32 +326,33 @@ Item {
 		}
 
 		function onResourcesChanged() {
-			if (root.visibilities.resources && (root.popouts.currentName.startsWith("audio") || root.popouts.currentName.startsWith("updates"))) {
-				root.popouts.hasCurrent = false;
-			}
+			if (root.screenState.resources) {
+				if (root.popouts.currentName.startsWith("audio") || root.popouts.currentName.startsWith("updates"))
+					root.popouts.hasCurrent = false;
 
-			if (root.visibilities.resources)
-				root.visibilities.settings = false;
+				root.screenState.settings = false;
+				root.screenState.dashboard = false;
+			}
 		}
 
 		function onSettingsChanged() {
-			if (root.visibilities.settings) {
-				root.visibilities.resources = false;
-				root.visibilities.dashboard = false;
-				root.visibilities.sidebar = false;
+			if (root.screenState.settings) {
+				root.screenState.resources = false;
+				root.screenState.dashboard = false;
+				root.screenState.sidebar = false;
 				root.panels.popouts.hasCurrent = false;
-				root.visibilities.launcher = false;
+				root.screenState.launcher = false;
 			}
 		}
 
 		function onSidebarChanged() {
-			if (root.visibilities.sidebar) {
-				root.visibilities.dashboard = false;
-				root.visibilities.settings = false;
+			if (root.screenState.sidebar) {
+				root.screenState.dashboard = false;
+				root.screenState.settings = false;
 				root.popouts.hasCurrent = false;
 			}
 		}
 
-		target: root.visibilities
+		target: root.screenState
 	}
 }

Drawers/Interactions2.qml

@@ -0,0 +1,315 @@
+import Quickshell
+import QtQuick
+import ZShell.Config
+import ZShell.Internal
+import qs.Components
+import qs.Helpers
+import qs.Modules.Bar.Popouts
+
+CustomMouseArea {
+	id: root
+
+	required property Item bar
+	required property real borderThickness
+	property bool dashboardShortcutActive
+	property point dragStart
+	required property Drawing drawing
+	required property EdgeGeometry geometry
+	property bool osdShortcutActive
+	required property Panels panels
+	required property Wrapper popouts
+	required property ShellScreen screen
+	required property ScreenState screenState
+	property bool setInitialPoint: false
+	property bool singleGestureTriggered: false
+	property bool utilitiesShortcutActive
+
+	function inBottomPanel(panel: Item, x: real, y: real): bool {
+		const panelHeight = panel.height * (1 - (panel.offsetScale ?? 0));
+		return y > root.height - (panelHeight + geometry.insetBottom(borderThickness)) && withinPanelWidth(panel, x, y);
+	}
+
+	function inLeftPanel(panel: Item, x: real, y: real): bool {
+		return x < panel.x + panel.width + geometry.insetLeft(borderThickness) && withinPanelHeight(panel, x, y);
+	}
+
+	function inPopoutArea(x: real, y: real): bool {
+		const panel = panels.popoutsWrapper;
+		if (!geometry.horizontal)
+			return inLeftPanel(panel, x, y);
+		return withinPanelWidth(panel, x, y) && withinPanelHeight(panel, x, y);
+	}
+
+	function inRightPanel(panel: Item, x: real, y: real): bool {
+		return x > panel.x + geometry.insetLeft(borderThickness) && withinPanelHeight(panel, x, y);
+	}
+
+	function inTopPanel(panel: Item, x: real, y: real): bool {
+		const panelHeight = panel.height * (1 - (panel.offsetScale ?? 0));
+		return y < geometry.insetTop(borderThickness) + panelHeight && withinPanelWidth(panel, x, y);
+	}
+
+	function withinPanelHeight(panel: Item, x: real, y: real): bool {
+		const panelY = panel.y + geometry.insetTop(borderThickness);
+		return y >= panelY && y <= panelY + panel.height;
+	}
+
+	function withinPanelWidth(panel: Item, x: real, y: real): bool {
+		const panelX = panel.x + geometry.insetLeft(borderThickness);
+		return x >= panelX && x <= panelX + panel.width;
+	}
+
+	acceptedButtons: bar.fullscreen ? Qt.NoButton : Qt.AllButtons
+	anchors.fill: parent
+	hoverEnabled: true
+
+	onContainsMouseChanged: {
+		if (!containsMouse) {
+			if (!osdShortcutActive) {
+				screenState.osd = false;
+				panels.osd.hovered = false;
+			}
+
+			if (!popouts.currentName.startsWith("traymenu") || Config.bar.tray.showOnHover) {
+				popouts.hasCurrent = false;
+			}
+
+			if (Config.bar.autoHide || bar.fullscreen)
+				bar.isHovered = false;
+
+			if (screenState.dashboard && Config.dashboard.showOnHover)
+				screenState.dashboard = false;
+		}
+	}
+	onPositionChanged: event => {
+		const x = event.x;
+		const y = event.y;
+		const dragX = x - dragStart.x;
+		const dragY = y - dragStart.y;
+
+		if (screenState.isDrawing) {
+			if (pressed) {
+				drawing.content.appendPoint(x, y);
+			} else {
+				if (inLeftPanel(panels.drawing, x, y)) {
+					if (!(pressedButtons & Qt.LeftButton)) {
+						panels.drawing.expand();
+						drawing.content.hideHover();
+						Cursor.clearOverride();
+					}
+				} else {
+					Cursor.setOverride(Qt.BlankCursor);
+					drawing.content.showHover(x, y);
+				}
+			}
+			if (drawing.content.hoverVisible)
+				drawing.content.showHover(x, y);
+			return;
+		}
+
+		if (root.bar.fullscreen && !root.bar.isHovered)
+			unhideTimer.start();
+
+		if (pressed && dragStart.y >= screen.height - Config.bar.border && dragStart.x > screen.width / 5 && dragY < -Config.launcher.dragThreshold)
+			screenState.launcher = true;
+
+		const entryAt = bar.entryAt(geometry.axisPos(x, y));
+		const showDashboard = Config.dashboard.showOnHover && inTopPanel(panels.dashboardWrapper, x, y) && (!entryAt || entryAt === "activeWindow");
+
+		if (!dashboardShortcutActive) {
+			screenState.dashboard = showDashboard;
+		} else if (showDashboard) {
+			dashboardShortcutActive = false;
+		}
+
+		if (pressed && geometry.insetTop(borderThickness) > dragStart.y && withinPanelWidth(panels.dashboardWrapper, x, y)) {
+			if (dragY > Config.dashboard.dragThreshold)
+				screenState.dashboard = true;
+			else if (dragY < -Config.dashboard.dragThreshold)
+				screenState.dashboard = false;
+		}
+
+		if (pressed && geometry.insetTop(borderThickness) > dragStart.y && !inTopPanel(panels.dashboardWrapper, dragStart.x, dragStart.y)) {
+			if (dragY > 20) {
+				screenState.settings = true;
+			} else if (dragY < -20) {
+				screenState.settings = false;
+			}
+		}
+
+		if (pressed && dragStart.y > screen.height - geometry.insetBottom(borderThickness) && dragStart.x < screen.width / 5 && dragY < -50)
+			screenState.clipboard = true;
+
+		if (pressed && !Config.dock.hoverToReveal && dragStart.y > screen.height - geometry.insetTop(borderThickness) && dragStart.x > screen.width / 5 && !screenState.launcher)
+			if (dragY < -10)
+				screenState.dock = true;
+
+		if (pressed && dragStart.x > screen.width - Config.bar.border && dragStart.y < (screen.height / 2) && dragX < -Config.sidebar.dragThreshold)
+			screenState.sidebar = true;
+
+		if (pressed && dragStart.x >= screen.width - Config.bar.border && dragStart.y > (screen.height / 2) && dragX < -20)
+			Hypr.dispatch(`hl.dsp.focus({ workspace = 'r+1', on_current_monitor = true })`);
+
+		if (pressed && dragStart.x <= Config.bar.border && dragX > 20)
+			Hypr.dispatch(`hl.dsp.focus({ workspace = 'r-1', on_current_monitor = true })`);
+
+		if (!screenState.bar && Config.bar.autoHide && geometry.barContains(x, y, true))
+			bar.isHovered = true;
+
+		if (panels.sidebar.offsetScale === 1) {
+			const showOsd = inRightPanel(panels.osdWrapper, x, y);
+
+			if (showOsd) {
+				osdShortcutActive = false;
+				panels.osd.hovered = true;
+			}
+		} else {
+			const outOfSidebar = x < width - panels.sidebar.width * (1 - panels.sidebar.offsetScale);
+			const showOsd = outOfSidebar && inRightPanel(panels.osdWrapper, x, y);
+
+			if (!osdShortcutActive) {
+				screenState.osd = showOsd;
+				panels.osd.hovered = showOsd;
+			} else if (showOsd) {
+				osdShortcutActive = false;
+				panels.osd.hovered = true;
+			}
+		}
+
+		if (Config.dock.enable && Config.dock.hoverToReveal && !screenState.dock && !screenState.launcher && inBottomPanel(panels.dock, x, y))
+			screenState.dock = true;
+
+		if (geometry.barContains(x, y))
+			bar.checkPopout(geometry.axisPos(x, y));
+	}
+	onPressed: event => {
+		dragStart = Qt.point(event.x, event.y);
+
+		if (screenState.isDrawing) {
+			if (event.button & Qt.RightButton) {
+				drawing.content.clear();
+				return;
+			}
+
+			if (!inLeftPanel(panels.drawing, mouseX, mouseY))
+				drawing.content.beginStroke(event.x, event.y);
+		}
+	}
+	onPressedChanged: {
+		if (!pressed) {
+			if (screenState.isDrawing) {
+				setInitialPoint = false;
+				drawing.content.endStroke();
+				if (!inLeftPanel(panels.drawing, mouseX, mouseY))
+					drawing.content.showHover(mouseX, mouseY);
+			}
+		} else {
+			if (screenState.isDrawing) {
+				panels.drawing.collapse();
+			}
+		}
+	}
+
+	Timer {
+		id: unhideTimer
+
+		interval: Config.bar.revealDelay
+		repeat: false
+		running: false
+
+		onTriggered: {
+			if (root.containsMouse)
+				root.bar.isHovered = true;
+		}
+	}
+
+	Connections {
+		function onDashboardChanged(): void {
+			if (root.screenState.dashboard) {
+				const inDashboardArea = root.inTopPanel(root.panels.dashboardWrapper, root.mouseX, root.mouseY);
+				if (!inDashboardArea) {
+					root.dashboardShortcutActive = true;
+				}
+
+				root.screenState.launcher = false;
+				root.screenState.settings = false;
+				root.screenState.sidebar = false;
+				root.screenState.resources = false;
+				root.popouts.hasCurrent = false;
+			} else {
+				root.dashboardShortcutActive = false;
+			}
+		}
+
+		function onIsDrawingChanged(): void {
+			if (root.screenState.isDrawing) {
+				Cursor.setOverride(Qt.BlankCursor);
+			} else {
+				Cursor.clearOverride();
+			}
+		}
+
+		function onLauncherChanged(): void {
+			if (!root.screenState.launcher) {
+				root.dashboardShortcutActive = false;
+				root.osdShortcutActive = false;
+				root.utilitiesShortcutActive = false;
+
+				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
+
+				if (!inOsdArea) {
+					root.screenState.osd = false;
+					root.panels.osd.hovered = false;
+				}
+			}
+
+			if (root.screenState.launcher) {
+				root.screenState.dashboard = false;
+				root.screenState.dock = false;
+				root.screenState.settings = false;
+			}
+		}
+
+		function onOsdChanged(): void {
+			if (root.screenState.osd) {
+				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
+				if (!inOsdArea) {
+					root.osdShortcutActive = true;
+				}
+			} else {
+				root.osdShortcutActive = false;
+			}
+		}
+
+		function onResourcesChanged(): void {
+			if (root.screenState.resources) {
+				if (root.popouts.currentName.startsWith("audio") || root.popouts.currentName.startsWith("updates"))
+					root.popouts.hasCurrent = false;
+
+				root.screenState.settings = false;
+				root.screenState.dashboard = false;
+			}
+		}
+
+		function onSettingsChanged(): void {
+			if (root.screenState.settings) {
+				root.screenState.resources = false;
+				root.screenState.dashboard = false;
+				root.screenState.sidebar = false;
+				root.panels.popouts.hasCurrent = false;
+				root.screenState.launcher = false;
+			}
+		}
+
+		function onSidebarChanged(): void {
+			if (root.screenState.sidebar) {
+				if (root.panels.dashboardWrapper.x + root.panels.dashboardWrapper.width > root.panels.sidebar.x)
+					root.screenState.dashboard = false;
+				root.screenState.settings = false;
+				root.popouts.hasCurrent = false;
+			}
+		}
+
+		target: root.screenState
+	}
+}

Drawers/Panels.qml

@@ -37,12 +37,12 @@ Item {
 	readonly property alias resources: resources
 	readonly property alias resourcesWrapper: resourcesWrapper
 	required property ShellScreen screen
+	required property ScreenState screenState
 	readonly property alias settings: settings
 	readonly property alias settingsWrapper: settingsWrapper
 	readonly property alias sidebar: sidebar
 	readonly property alias toasts: toasts
 	readonly property alias utilities: utilities
-	required property PersistentProperties visibilities
 
 	anchors.bottomMargin: geometry.insetBottom(borderThickness)
 	anchors.fill: parent
@@ -64,7 +64,7 @@ Item {
 			id: resources
 
 			position: root.geometry.position
-			visibilities: root.visibilities
+			screenState: root.screenState
 		}
 	}
 
@@ -84,8 +84,8 @@ Item {
 			anchors.right: parent.right
 			anchors.verticalCenter: parent.verticalCenter
 			screen: root.screen
+			screenState: root.screenState
 			sidebarOrSessionVisible: sidebar.visible
-			visibilities: root.visibilities
 		}
 	}
 
@@ -96,7 +96,7 @@ Item {
 		anchors.verticalCenter: parent.verticalCenter
 		drawing: root.drawingItem
 		screen: root.screen
-		visibilities: root.visibilities
+		screenState: root.screenState
 	}
 
 	Popouts.ClipWrapper {
@@ -121,8 +121,8 @@ Item {
 		anchors.right: parent.right
 		anchors.top: parent.top
 		panels: root
+		screenState: root.screenState
 		sidebarPanel: sidebar
-		visibilities: root.visibilities
 	}
 
 	Launcher.Wrapper {
@@ -132,7 +132,7 @@ Item {
 		anchors.horizontalCenter: parent.horizontalCenter
 		panels: root
 		screen: root.screen
-		visibilities: root.visibilities
+		screenState: root.screenState
 	}
 
 	Utils.Wrapper {
@@ -140,9 +140,8 @@ Item {
 
 		anchors.bottom: parent.bottom
 		anchors.right: parent.right
-		popouts: popouts
+		screenState: root.screenState
 		sidebar: sidebar
-		visibilities: root.visibilities
 	}
 
 	Item {
@@ -150,13 +149,11 @@ Item {
 
 		property real offsetScale: dashboard.shouldBeActive ? 0 : 1
 
-		anchors.bottom: root.geometry.barOnLeft || root.geometry.barOnBottom ? parent.bottom : undefined
-		anchors.left: root.geometry.barOnLeft ? parent.left : undefined
-		anchors.right: root.geometry.barOnLeft ? undefined : parent.right
-		anchors.top: root.geometry.barOnBottom || root.geometry.barOnLeft ? undefined : parent.top
-		clip: true
-		implicitHeight: root.geometry.horizontal ? dashboard.implicitHeight * (1 - offsetScale) : dashboard.implicitHeight
-		implicitWidth: root.geometry.horizontal ? dashboard.implicitWidth : dashboard.implicitWidth * (1 - offsetScale)
+		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.top: parent.top
+		clip: offsetScale > 0
+		implicitHeight: dashboard.implicitHeight * (1 - offsetScale)
+		implicitWidth: dashboard.implicitWidth
 
 		Behavior on offsetScale {
 			Anim {
@@ -169,8 +166,7 @@ Item {
 			id: dashboard
 
 			offsetScale: dashboardWrapper.offsetScale
-			position: root.geometry.position
-			visibilities: root.visibilities
+			screenState: root.screenState
 		}
 	}
 
@@ -181,7 +177,7 @@ Item {
 		anchors.right: parent.right
 		anchors.top: notifications.bottom
 		panels: root
-		visibilities: root.visibilities
+		screenState: root.screenState
 	}
 
 	Item {
@@ -197,7 +193,7 @@ Item {
 			anchors.verticalCenterOffset: (-implicitHeight - 5 - ((root.height - implicitHeight) / 2)) * offsetScale
 			panels: root
 			screen: root.screen
-			visibilities: root.visibilities
+			screenState: root.screenState
 		}
 	}
 
@@ -208,7 +204,7 @@ Item {
 		anchors.horizontalCenter: parent.horizontalCenter
 		panels: root
 		screen: root.screen
-		visibilities: root.visibilities
+		screenState: root.screenState
 	}
 
 	Clipboard.Wrapper {
@@ -217,6 +213,6 @@ Item {
 		anchors.bottom: parent.bottom
 		anchors.left: parent.left
 		screen: root.screen
-		visibilities: root.visibilities
+		screenState: root.screenState
 	}
 }

Drawers/Windows.qml

@@ -51,49 +51,47 @@ CustomWindow {
 	readonly property alias menuRegion: regions.menuPopoutRegion
 	readonly property HyprlandMonitor monitor: Hypr.monitorFor(screen)
 	property var root: Quickshell.shellDir
+	readonly property ScreenState screenState: ShellState.forScreen(screen)
 	readonly property real sdfBorderOffset: 2 * fsTransitionProg
-	readonly property real shadowOpacity: 0.7 * (1 - (bar.isHovered ? 0 : fsTransitionProg))
+	readonly property real shadowOpacity: 0.5 * (1 - (bar.isHovered ? 0 : fsTransitionProg))
 	property color surfaceColor: Colors.tPalette.m3surface
 
 	WlrLayershell.exclusionMode: ExclusionMode.Ignore
-	WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.settings ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
+	WlrLayershell.keyboardFocus: screenState.screenshot ? WlrKeyboardFocus.Exclusive : screenState.launcher || screenState.settings || screenState.sidebar ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
 	WlrLayershell.layer: (fsTransitionProg > 0 && Config.general.showOverFullscreen) || (hasSpecialWorkspace && hasFullscreenOnNormalWs) ? WlrLayer.Overlay : WlrLayer.Top
 	color: "transparent"
-	contentItem.focus: true
-	mask: visibilities.isDrawing ? null : (hasFullscreen && !bar.isHovered ? emptyRegion : regions)
+	mask: screenState.isDrawing || screenState.screenshot ? null : (hasFullscreen && !bar.isHovered ? emptyRegion : regions)
 	name: "Bar"
 
 	Behavior on fsTransitionProg {
-		Anim {
-		}
+		Anim {}
 	}
 	Behavior on surfaceColor {
-		CAnim {
-		}
+		CAnim {}
 	}
 
 	contentItem.Keys.onEscapePressed: {
 		if (Config.bar.autoHide)
-			visibilities.bar = false;
-		visibilities.launcher = false;
-		visibilities.sidebar = false;
-		visibilities.dashboard = false;
-		visibilities.osd = false;
-		visibilities.settings = false;
-		visibilities.resources = false;
-		visibilities.dock = false;
-		visibilities.clipboard = false;
+			screenState.bar = false;
+		screenState.launcher = false;
+		screenState.sidebar = false;
+		screenState.dashboard = false;
+		screenState.osd = false;
+		screenState.settings = false;
+		screenState.resources = false;
+		screenState.dock = false;
+		screenState.clipboard = false;
 		panels.popouts.hasCurrent = false;
 	}
 	onHasFullscreenChanged: {
-		visibilities.launcher = false;
-		visibilities.sidebar = false;
-		visibilities.dashboard = false;
-		visibilities.osd = false;
-		visibilities.settings = false;
-		visibilities.resources = false;
-		visibilities.clipboard = false;
-		visibilities.dock = false;
+		screenState.launcher = false;
+		screenState.sidebar = false;
+		screenState.dashboard = false;
+		screenState.osd = false;
+		screenState.settings = false;
+		screenState.resources = false;
+		screenState.clipboard = false;
+		screenState.dock = false;
 		panels.popouts.hasCurrent = false;
 	}
 
@@ -146,53 +144,40 @@ CustomWindow {
 		id: focusGrab
 
 		active: {
-			const v = visibilities;
-			const conf = Config;
-			if (!N.PopupManager.closed && panels.popouts.hasCurrent)
+			const s = root.screenState;
+			const c = Config;
+
+			if ((s.launcher && c.launcher.enabled) || (s.sidebar && c.sidebar.enabled) || (s.resources && c.dashboard.performance.enabled) || (s.clipboard && c.clipboard.enabled))
 				return true;
-			if ((v.launcher && conf.launcher.enabled) || (v.sidebar && conf.sidebar.enabled) || (v.resources && conf.dashboard.performance.enabled) || (v.dashboard && conf.dashboard.enabled) || v.settings || (v.clipboard && conf.clipboard.enabled) || (v.dock && conf.dock.enabled))
+			if (s.dashboard && !c.dashboard.showOnHover && c.dashboard.enabled)
 				return true;
-			if (panels.popouts.hasCurrent && panels.popouts.currentName.startsWith("traymenu") && (!conf.bar.tray.showOnHover || (panels.popouts.current as StackView)?.depth > 1))
+			if (!c.dock.hoverToReveal && s.dock && c.dock.enable)
+				return true;
+			if (panels.popouts.currentName.startsWith("traymenu") && (panels.popouts.current as StackView)?.depth > 1)
+				return true;
+			if (s.settings)
 				return true;
 			return false;
 		}
 		windows: [root]
 
 		onCleared: {
-			visibilities.launcher = false;
-			visibilities.sidebar = false;
-			visibilities.dashboard = false;
-			visibilities.osd = false;
-			visibilities.settings = false;
-			visibilities.resources = false;
-			visibilities.clipboard = false;
-			visibilities.dock = false;
+			root.screenState.launcher = false;
+			root.screenState.sidebar = false;
+			root.screenState.dashboard = false;
+			root.screenState.osd = false;
+			root.screenState.settings = false;
+			root.screenState.resources = false;
+			root.screenState.clipboard = false;
+			root.screenState.dock = false;
 			panels.popouts.hasCurrent = false;
 		}
 	}
 
-	PersistentProperties {
-		id: visibilities
-
-		property bool bar
-		property bool clipboard
-		property bool dashboard
-		property bool dock
-		property bool isDrawing
-		property bool launcher
-		property bool notif: NotifServer.popups.length > 0
-		property bool osd
-		property bool resources
-		property bool settings
-		property bool sidebar
-
-		Component.onCompleted: Visibilities.load(root.screen, this)
-	}
-
 	Binding {
 		property: "bar"
-		target: visibilities
-		value: visibilities.sidebar || visibilities.dashboard || visibilities.osd || (!Config.bar.hideWhenNotif && visibilities.notif) || visibilities.resources || visibilities.settings || bar.isHovered
+		target: root.screenState
+		value: root.screenState.sidebar || root.screenState.dashboard || root.screenState.osd || (!Config.bar.hideWhenNotif && NotifServer.popups.length > 0) || root.screenState.resources || root.screenState.settings || bar.isHovered
 		when: Config.bar.autoHide
 	}
 
@@ -200,23 +185,19 @@ CustomWindow {
 		id: surface
 
 		anchors.fill: parent
-		layer.enabled: true
 		opacity: root.surfaceColor.a
 
-		layer.effect: MultiEffect {
-			blurMax: 32
-			shadowColor: Qt.alpha(Colors.palette.m3shadow, Math.max(0, root.shadowOpacity))
-			shadowEnabled: true
-		}
-
-		BlobGroup {
+		BlobGroup2 {
 			id: blobGroup
 
+			anchors.fill: parent
 			color: root.surfaceColor
+			shadowColor: Qt.alpha(Colors.palette.m3shadow, Math.max(0, root.shadowOpacity))
+			shadowRadius: 18
 			smoothing: Config.bar.smoothing
 		}
 
-		BlobInvertedRect {
+		BlobInvertedRect2 {
 			anchors.fill: parent
 			anchors.margins: -50
 			borderBottom: geometry.insetBottom(root.borderThickness) - anchors.margins - root.sdfBorderOffset
@@ -266,6 +247,7 @@ CustomWindow {
 		PanelBg {
 			id: osdBg
 
+			atRestOverride: panels.osd.offsetScale < 0.99
 			deformAmount: 0.1
 			implicitHeight: panels.osd.height
 			implicitWidth: panels.osd.width
@@ -277,6 +259,7 @@ CustomWindow {
 		PanelBg {
 			id: notifsBg
 
+			atRestOverride: panel.implicitHeight > 0
 			panel: panels.notifications
 			radius: Tokens.rounding.large
 		}
@@ -304,21 +287,23 @@ CustomWindow {
 			y: panels.popoutsWrapper.y + panels.popouts.y + geometry.insetTop(root.borderThickness) - (geometry.barOnTop ? panels.popouts.height * extraExtent : 0)
 
 			Behavior on extraExtent {
-				Anim {
-				}
+				Anim {}
 			}
 		}
 
 		PanelBg {
 			id: resourcesBg
 
+			property real extraExtent: 0.2
+
+			atRestOverride: panels.resources.offsetScale < 0.99
 			deformAmount: 0.05
-			implicitHeight: panels.resources.height
-			implicitWidth: panels.resources.width
+			implicitHeight: panels.resources.height * (1 + extraExtent)
+			implicitWidth: panels.resources.width * (1 + extraExtent)
 			panel: panels.resourcesWrapper
 			radius: Tokens.rounding.largeIncreased + Tokens.padding.small
-			x: panels.resourcesWrapper.x + panels.resources.x + geometry.insetLeft(root.borderThickness)
-			y: panels.resourcesWrapper.y + panels.resources.y + geometry.insetTop(root.borderThickness)
+			x: panels.resourcesWrapper.x + panels.resources.x + geometry.insetLeft(root.borderThickness) - panels.resources.width * extraExtent
+			y: panels.resourcesWrapper.y + panels.resources.y + geometry.insetTop(root.borderThickness) - panels.resources.height * extraExtent
 		}
 
 		PanelBg {
@@ -348,9 +333,15 @@ CustomWindow {
 		PanelBg {
 			id: clipboardBg
 
+			property real extraExtent: 0.2
+
 			deformAmount: 0.03
+			implicitHeight: panels.clipboard.height * (1 + extraExtent)
+			implicitWidth: panels.clipboard.width * (1 + extraExtent)
 			panel: panels.clipboard
 			radius: 29
+			x: panels.clipboard.x + geometry.insetLeft(root.borderThickness) - panels.clipboard.width * extraExtent
+			y: panels.clipboard.y + geometry.insetTop(root.borderThickness)
 		}
 	}
 
@@ -358,37 +349,11 @@ CustomWindow {
 		id: drawing
 
 		anchors.fill: parent
-		layer.enabled: true
-		visibilities: visibilities
+		screenState: root.screenState
 		z: 2
-
-		layer.effect: MultiEffect {
-			maskEnabled: true
-			maskInverted: true
-			maskSource: maskSource
-		}
 	}
 
-	Item {
-		id: maskSource
-
-		anchors.fill: parent
-		layer.enabled: true
-		visible: false
-
-		CustomRect {
-			readonly property int extraWidth: radius
-
-			color: "white"
-			implicitHeight: panels.drawing.height
-			implicitWidth: panels.drawing.width + extraWidth
-			radius: drawingBg.radius
-			x: -extraWidth + root.borderThickness + panels.drawing.x
-			y: panels.drawing.y + bar.implicitHeight
-		}
-	}
-
-	Interactions {
+	Interactions2 {
 		id: interactions
 
 		anchors.fill: parent
@@ -400,7 +365,7 @@ CustomWindow {
 		panels: panels
 		popouts: panels.popouts
 		screen: root.screen
-		visibilities: visibilities
+		screenState: root.screenState
 
 		Panels {
 			id: panels
@@ -410,7 +375,7 @@ CustomWindow {
 			drawingItem: drawing
 			geometry: geometry
 			screen: root.screen
-			visibilities: visibilities
+			screenState: root.screenState
 
 			clipboard.transform: Matrix4x4 {
 				matrix: clipboardBg.deformMatrix
@@ -453,22 +418,40 @@ CustomWindow {
 			anchors.bottom: geometry.barOnBottom ? parent.bottom : undefined
 			anchors.left: parent.left
 			anchors.top: geometry.barOnBottom ? undefined : parent.top
-			enabled: !visibilities.isDrawing
+			enabled: !screenState.isDrawing
 			fullscreen: root.hasFullscreen
 			height: geometry.horizontal ? implicitHeight : parent.height
 			popouts: panels.popouts
 			popoutsWrapper: panels.popoutsWrapper
 			position: geometry.position
 			screen: root.screen
-			visibilities: visibilities
+			screenState: root.screenState
 			width: geometry.horizontal ? parent.width : implicitWidth
 		}
 	}
 
-	component PanelBg: BlobRect {
+	LazyLoader {
+		id: loader
+
+		property bool closing: !root.screenState.screenshot
+
+		onClosingChanged: if (!closing)
+			activeAsync = true
+
+		Picker {
+			loader: loader
+			parent: root.contentItem
+			screen: root.screen
+			screenState: root.screenState
+		}
+	}
+
+	component PanelBg: BlobRect2 {
 		property real deformAmount: 0.15
 		required property Item panel
 
+		atRestOverride: panel?.offsetScale < 0.99 ?? false
+		damping: 28.3
 		deformScale: (deformAmount * Config.appearance.deform.scale) / 10000
 		group: blobGroup
 		implicitHeight: panel.height