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

Modules/Bar/BarLoader.qml

@@ -1,45 +1,48 @@
 pragma ComponentBehavior: Bound
 
 import Quickshell
-import Quickshell.Hyprland
 import QtQuick
-import QtQuick.Layouts
-import qs.Components
-import qs.Modules
 import ZShell.Config
-import qs.Helpers
-import qs.Modules.SysTray
-import qs.Modules.SysTray.Widgets
-import qs.Modules.Network
+import qs.Modules.Bar.Popouts
+import qs.Components
 
 Item {
 	id: root
 
-	readonly property int contentHeight: Config.bar.height + padding * 2
-	readonly property int exclusiveZone: Config.bar.autoHide ? Config.bar.border : contentHeight
+	readonly property int clampedExtent: Math.max(Config.bar.border, extent)
+	readonly property int contentThickness: Math.floor(Math.max(Config.bar.height, Tokens.bar.innerSize * (horizontal ? 1 : 1.5))) + padding * 2
+	readonly property int exclusiveZone: Config.bar.autoHide ? Config.bar.border : contentThickness
+	property real extent: fullscreen ? 0 : Config.bar.border
 	required property bool fullscreen
+	readonly property bool horizontal: position !== "left"
 	property bool isHovered
 	readonly property int padding: Math.max(Tokens.padding.smaller, Config.bar.border)
 	required property Wrapper popouts
 	required property ClipWrapper popoutsWrapper
+	required property string position
 	required property ShellScreen screen
 	readonly property bool shouldBeVisible: (!fullscreen && (!Config.bar.autoHide || visibilities.bar)) || isHovered
 	readonly property int vPadding: 6
 	required property PersistentProperties visibilities
 
-	function checkPopout(x: real): void {
-		content.item?.checkPopout(x);
+	function checkPopout(pos: real): void {
+		(content.item as Bar)?.checkPopout(pos);
 	}
 
-	implicitHeight: fullscreen ? 0 : Config.bar.border
-	visible: height > Config.bar.border
+	function entryAt(pos: real): string {
+		return (content.item as Bar)?.entryAt(pos) ?? "";
+	}
+
+	implicitHeight: extent
+	implicitWidth: extent
+	visible: extent > Config.bar.border
 
 	states: State {
 		name: "visible"
 		when: root.shouldBeVisible
 
 		PropertyChanges {
-			root.implicitHeight: root.contentHeight
+			root.extent: root.contentThickness
 		}
 	}
 	transitions: [
@@ -48,7 +51,7 @@ Item {
 			to: "visible"
 
 			Anim {
-				property: "implicitHeight"
+				property: "extent"
 				target: root
 			}
 		},
@@ -57,7 +60,7 @@ Item {
 			to: ""
 
 			Anim {
-				property: "implicitHeight"
+				property: "extent"
 				target: root
 			}
 		}
@@ -67,13 +70,17 @@ Item {
 		id: content
 
 		active: root.shouldBeVisible || root.visible
-		anchors.bottom: parent.bottom
-		anchors.left: parent.left
+		anchors.bottom: root.position !== "bottom" ? parent.bottom : undefined
+		anchors.left: root.horizontal ? parent.left : undefined
 		anchors.right: parent.right
+		anchors.top: root.position !== "top" ? parent.top : undefined
+		height: root.contentThickness
+		width: root.contentThickness
 
 		sourceComponent: Bar {
 			fullscreen: root.fullscreen
 			height: root.contentHeight
+			horizontal: root.horizontal
 			isHovered: root.isHovered
 			popouts: root.popouts
 			popoutsWrapper: root.popoutsWrapper