Merge branch 'main' into feat/fullscreen-reveal-bar

Drawers/Exclusions.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
 import Quickshell
+import Quickshell.Wayland
 import QtQuick
 import ZShell.Config
 import qs.Components
@@ -14,6 +15,9 @@ Scope {
 	ExclusionZone {
 		id: top
 
+		WlrLayershell.layer: WlrLayer.Overlay
+		anchors.left: true
+		anchors.right: true
 		anchors.top: true
 		exclusiveZone: root.bar.exclusiveZone
 	}

Drawers/Interactions.qml

@@ -158,6 +158,19 @@ Item {
 		}
 	}
 
+	Timer {
+		id: unhideTimer
+
+		interval: Config.bar.revealDelay
+		repeat: false
+		running: false
+
+		onTriggered: {
+			if (hoverHandler.hovered)
+				root.bar.isHovered = true;
+		}
+	}
+
 	HoverHandler {
 		id: hoverHandler
 
@@ -174,7 +187,7 @@ Item {
 					root.popouts.hasCurrent = false;
 				}
 
-				if (Config.bar.autoHide)
+				if (Config.bar.autoHide || root.bar.fullscreen)
 					root.bar.isHovered = false;
 			}
 		}
@@ -196,6 +209,9 @@ Item {
 			if (!root.visibilities.bar && Config.bar.autoHide && y < root.bar.implicitHeight)
 				root.bar.isHovered = true;
 
+			if (root.bar.fullscreen && !root.bar.isHovered)
+				unhideTimer.start();
+
 			if (root.panels.sidebar.offsetScale === 1) {
 				const showOsd = root.inRightPanel(root.panels.osdWrapper, x, y);
 

Drawers/Regions.qml

@@ -17,7 +17,7 @@ Region {
 	intersection: Intersection.Xor
 	width: win.width - win.borderThickness * 2 - win.dragMaskPadding * 2
 	x: win.borderThickness + win.dragMaskPadding
-	y: bar.implicitHeight + win.dragMaskPadding
+	y: bar.implicitHeight + win.dragMaskPadding + (bar.fullscreen ? 1 : 0)
 
 	R {
 		panel: root.panels.dashboardWrapper

Drawers/Windows.qml

@@ -50,7 +50,7 @@ CustomWindow {
 	readonly property HyprlandMonitor monitor: Hypr.monitorFor(screen)
 	property var root: Quickshell.shellDir
 	readonly property real sdfBorderOffset: 2 * fsTransitionProg
-	readonly property real shadowOpacity: 0.7 * (1 - fsTransitionProg)
+	readonly property real shadowOpacity: 0.7 * (1 - (bar.isHovered ? 0 : fsTransitionProg))
 	property color surfaceColor: Colors.tPalette.m3surface
 
 	WlrLayershell.exclusionMode: ExclusionMode.Ignore
@@ -58,7 +58,7 @@ CustomWindow {
 	WlrLayershell.layer: (fsTransitionProg > 0 && Config.general.showOverFullscreen) || (hasSpecialWorkspace && hasFullscreenOnNormalWs) ? WlrLayer.Overlay : WlrLayer.Top
 	color: "transparent"
 	contentItem.focus: true
-	mask: visibilities.isDrawing ? null : (hasFullscreen ? emptyRegion : regions)
+	mask: visibilities.isDrawing ? null : (hasFullscreen && !bar.isHovered ? emptyRegion : regions)
 	name: "Bar"
 
 	Behavior on fsTransitionProg {
@@ -109,6 +109,11 @@ CustomWindow {
 			x: root.width - width
 			y: panels.osdWrapper.y + bar.implicitHeight
 		}
+
+		Region {
+			height: 1
+			width: root.screen.width
+		}
 	}
 
 	Regions {

Modules/Bar/Bar.qml

@@ -13,6 +13,7 @@ RowLayout {
 	id: root
 
 	required property bool fullscreen
+	required property bool isHovered
 	required property Wrapper popouts
 	required property ClipWrapper popoutsWrapper
 	required property ShellScreen screen
@@ -85,7 +86,7 @@ RowLayout {
 
 				delegate: EntryWrapper {
 					HyprsunsetWidget {
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -104,7 +105,7 @@ RowLayout {
 				delegate: EntryWrapper {
 					Workspaces {
 						screen: root.screen
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -116,7 +117,7 @@ RowLayout {
 					TrayIcons {
 						loader: root
 						popouts: root.popouts
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -136,7 +137,7 @@ RowLayout {
 				delegate: EntryWrapper {
 					Resources {
 						visibilities: root.visibilities
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -146,7 +147,7 @@ RowLayout {
 
 				delegate: EntryWrapper {
 					UpdatesWidget {
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -158,7 +159,7 @@ RowLayout {
 					NotifBell {
 						popouts: root.popouts
 						visibilities: root.visibilities
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -171,7 +172,7 @@ RowLayout {
 						loader: root
 						popouts: root.popouts
 						visibilities: root.visibilities
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -182,7 +183,7 @@ RowLayout {
 				delegate: EntryWrapper {
 					WindowTitle {
 						bar: root
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}
@@ -201,7 +202,7 @@ RowLayout {
 
 				delegate: EntryWrapper {
 					MediaWidget {
-						visible: !root.fullscreen
+						visible: !root.fullscreen || root.isHovered
 					}
 				}
 			}

Modules/Bar/BarLoader.qml

@@ -23,7 +23,7 @@ Item {
 	required property Wrapper popouts
 	required property ClipWrapper popoutsWrapper
 	required property ShellScreen screen
-	readonly property bool shouldBeVisible: !fullscreen && (!Config.bar.autoHide || visibilities.bar || isHovered)
+	readonly property bool shouldBeVisible: (!fullscreen && (!Config.bar.autoHide || visibilities.bar)) || isHovered
 	readonly property int vPadding: 6
 	required property PersistentProperties visibilities
 
@@ -74,6 +74,7 @@ Item {
 		sourceComponent: Bar {
 			fullscreen: root.fullscreen
 			height: root.contentHeight
+			isHovered: root.isHovered
 			popouts: root.popouts
 			popoutsWrapper: root.popoutsWrapper
 			screen: root.screen

Modules/Settings/Pages/Panels/BarPanel.qml

@@ -25,7 +25,6 @@ PageBase {
 		ToggleRow {
 			checked: Config.bar.autoHide
 			first: true
-			last: true
 			settingAnchor: "bar-autohide"
 			subtext: qsTr("Hide the bar, reveal on hover")
 			text: qsTr("Auto hide")
@@ -33,6 +32,28 @@ PageBase {
 			onToggled: Config.bar.autoHide = checked
 		}
 
+		ToggleRow {
+			checked: Config.bar.fullscreenReveal
+			settingAnchor: "bar-fullscreen-reveal"
+			subtext: qsTr("Hover top edge to show bar in fullscreen")
+			text: qsTr("Reveal on edge")
+
+			onToggled: Config.bar.fullscreenReveal = checked
+		}
+
+		SpinRow {
+			from: 0
+			last: true
+			settingAnchor: "bar-reveal-delay"
+			stepSize: 100
+			subtext: qsTr("The delay before bar is revealed when cursor is at edge")
+			text: qsTr("Reveal delay")
+			to: 2000
+			value: Config.bar.revealDelay
+
+			onMoved: v => Config.bar.revealDelay = v
+		}
+
 		// Components
 		SectionHeader {
 			text: qsTr("Components")