formatter

Modules/Bar/BarLoader.qml

@@ -13,24 +13,23 @@ import qs.Modules.Network
 
 RowLayout {
 	id: root
-	anchors.fill: parent
 
-	readonly property int vPadding: 6
-	required property Wrapper popouts
-	required property PersistentProperties visibilities
 	required property PanelWindow bar
+	required property Wrapper popouts
 	required property ShellScreen screen
+	readonly property int vPadding: 6
+	required property PersistentProperties visibilities
 
 	function checkPopout(x: real): void {
 		const ch = childAt(x, 2) as WrappedLoader;
 
 		if (!ch) {
-			if ( !popouts.currentName.includes("traymenu") )
+			if (!popouts.currentName.includes("traymenu"))
 				popouts.hasCurrent = false;
 			return;
 		}
 
-		if ( visibilities.sidebar || visibilities.dashboard )
+		if (visibilities.sidebar || visibilities.dashboard)
 			return;
 
 		const id = ch.id;
@@ -38,49 +37,50 @@ RowLayout {
 		const item = ch.item;
 		const itemWidth = item.implicitWidth;
 
-
 		if (id === "audio" && Config.barConfig.popouts.audio) {
 			popouts.currentName = "audio";
-			popouts.currentCenter = Qt.binding( () => item.mapToItem(root, itemWidth / 2, 0 ).x );
+			popouts.currentCenter = Qt.binding(() => item.mapToItem(root, itemWidth / 2, 0).x);
 			popouts.hasCurrent = true;
-		} else if ( id === "resources" && Config.barConfig.popouts.resources ) {
+		} else if (id === "resources" && Config.barConfig.popouts.resources) {
 			popouts.currentName = "resources";
-			popouts.currentCenter = Qt.binding( () => item.mapToItem( root, itemWidth / 2, 0 ).x );
+			popouts.currentCenter = Qt.binding(() => item.mapToItem(root, itemWidth / 2, 0).x);
 			popouts.hasCurrent = true;
-		} else if ( id === "tray" && Config.barConfig.popouts.tray ) {
-			const index = Math.floor((( x - top ) / item.implicitWidth ) * item.items.count );
-			const trayItem = item.items.itemAt( index );
-			if ( trayItem ) {
+		} else if (id === "tray" && Config.barConfig.popouts.tray) {
+			const index = Math.floor(((x - top) / item.implicitWidth) * item.items.count);
+			const trayItem = item.items.itemAt(index);
+			if (trayItem) {
 				// popouts.currentName = `traymenu${ index }`;
 				// popouts.currentCenter = Qt.binding( () => trayItem.mapToItem( root, trayItem.implicitWidth / 2, 0 ).x );
 				// popouts.hasCurrent = true;
 			} else {
 				// popouts.hasCurrent = false;
 			}
-		} else if ( id === "clock" && Config.barConfig.popouts.clock ) {
+		} else if (id === "clock" && Config.barConfig.popouts.clock) {
 			// Calendar.displayYear = new Date().getFullYear();
 			// Calendar.displayMonth = new Date().getMonth();
 			// popouts.currentName = "calendar";
 			// popouts.currentCenter = Qt.binding( () => item.mapToItem( root, itemWidth / 2, 0 ).x );
 			// popouts.hasCurrent = true;
-		} else if ( id === "network" && Config.barConfig.popouts.network ) {
+		} else if (id === "network" && Config.barConfig.popouts.network) {
 			popouts.currentName = "network";
-			popouts.currentCenter = Qt.binding( () => item.mapToItem( root, itemWidth / 2, 0 ).x );
+			popouts.currentCenter = Qt.binding(() => item.mapToItem(root, itemWidth / 2, 0).x);
 			popouts.hasCurrent = true;
-		} else if ( id === "upower" && Config.barConfig.popouts.upower ) {
+		} else if (id === "upower" && Config.barConfig.popouts.upower) {
 			popouts.currentName = "upower";
-			popouts.currentCenter = Qt.binding( () => item.mapToItem( root, itemWidth / 2, 0 ).x );
+			popouts.currentCenter = Qt.binding(() => item.mapToItem(root, itemWidth / 2, 0).x);
 			popouts.hasCurrent = true;
 		}
 	}
 
+	anchors.fill: parent
+
 	CustomShortcut {
 		name: "toggle-overview"
 
 		onPressed: {
 			Hyprland.refreshWorkspaces();
 			Hyprland.refreshMonitors();
-			if ( root.popouts.hasCurrent && root.popouts.currentName === "overview" ) {
+			if (root.popouts.hasCurrent && root.popouts.currentName === "overview") {
 				root.popouts.hasCurrent = false;
 			} else {
 				root.popouts.currentName = "overview";
@@ -92,6 +92,7 @@ RowLayout {
 
 	Repeater {
 		id: repeater
+
 		model: Config.barConfig.entries
 
 		DelegateChooser {
@@ -99,67 +100,87 @@ RowLayout {
 
 			DelegateChoice {
 				roleValue: "spacer"
+
 				delegate: WrappedLoader {
 					Layout.fillWidth: true
 				}
 			}
+
 			DelegateChoice {
 				roleValue: "workspaces"
+
 				delegate: WrappedLoader {
 					sourceComponent: Workspaces {
 						bar: root.bar
 					}
 				}
 			}
+
 			DelegateChoice {
 				roleValue: "audio"
+
 				delegate: WrappedLoader {
-					sourceComponent: AudioWidget {}
+					sourceComponent: AudioWidget {
+					}
 				}
 			}
+
 			DelegateChoice {
 				roleValue: "tray"
+
 				delegate: WrappedLoader {
 					sourceComponent: TrayWidget {
 						bar: root.bar
-						popouts: root.popouts
 						loader: root
+						popouts: root.popouts
 					}
 				}
 			}
+
 			DelegateChoice {
 				roleValue: "resources"
+
 				delegate: WrappedLoader {
-					sourceComponent: Resources {}
+					sourceComponent: Resources {
+					}
 				}
 			}
+
 			DelegateChoice {
 				roleValue: "updates"
+
 				delegate: WrappedLoader {
-					sourceComponent: UpdatesWidget {}
+					sourceComponent: UpdatesWidget {
+					}
 				}
 			}
+
 			DelegateChoice {
 				roleValue: "notifBell"
+
 				delegate: WrappedLoader {
 					sourceComponent: NotifBell {
-						visibilities: root.visibilities
 						popouts: root.popouts
+						visibilities: root.visibilities
 					}
 				}
 			}
+
 			DelegateChoice {
 				roleValue: "clock"
+
 				delegate: WrappedLoader {
 					sourceComponent: Clock {
+						loader: root
 						popouts: root.popouts
 						visibilities: root.visibilities
-						loader: root
 					}
 				}
 			}
+
 			DelegateChoice {
 				roleValue: "activeWindow"
+
 				delegate: WrappedLoader {
 					sourceComponent: WindowTitle {
 						bar: root
@@ -167,16 +188,22 @@ RowLayout {
 					}
 				}
 			}
+
 			DelegateChoice {
 				roleValue: "upower"
+
 				delegate: WrappedLoader {
-					sourceComponent: UPowerWidget {}
+					sourceComponent: UPowerWidget {
+					}
 				}
 			}
+
 			DelegateChoice {
 				roleValue: "network"
+
 				delegate: WrappedLoader {
-					sourceComponent: NetworkWidget {}
+					sourceComponent: NetworkWidget {
+					}
 				}
 			}
 			// DelegateChoice {
@@ -195,15 +222,12 @@ RowLayout {
 		required property string id
 		required property int index
 
-		Layout.alignment: Qt.AlignVCenter
-		Layout.fillHeight: true
-
 		function findFirstEnabled(): Item {
 			const count = repeater.count;
 			for (let i = 0; i < count; i++) {
 				const item = repeater.itemAt(i);
 				if (item?.enabled)
-				return item;
+					return item;
 			}
 			return null;
 		}
@@ -212,15 +236,16 @@ RowLayout {
 			for (let i = repeater.count - 1; i >= 0; i--) {
 				const item = repeater.itemAt(i);
 				if (item?.enabled)
-				return item;
+					return item;
 			}
 			return null;
 		}
 
+		Layout.alignment: Qt.AlignVCenter
+		Layout.fillHeight: true
 		Layout.leftMargin: findFirstEnabled() === this ? root.vPadding : 0
 		Layout.rightMargin: findLastEnabled() === this ? root.vPadding : 0
-
-		visible: enabled
 		active: enabled
+		visible: enabled
 	}
 }