diff --git a/.config/quickshell/modules/bar/Bar.qml b/.config/quickshell/modules/bar/Bar.qml index 5402b14e..ac1f8cf8 100644 --- a/.config/quickshell/modules/bar/Bar.qml +++ b/.config/quickshell/modules/bar/Bar.qml @@ -46,16 +46,20 @@ Scope { color: "transparent" anchors { - top: true + top: !ConfigOptions.bar.bottom + bottom: ConfigOptions.bar.bottom left: true right: true } Rectangle { // Bar background id: barContent - anchors.right: parent.right - anchors.left: parent.left - anchors.top: parent.top + anchors { + right: parent.right + left: parent.left + top: !ConfigOptions.bar.bottom ? parent.top : undefined + bottom: ConfigOptions.bar.bottom ? parent.bottom : undefined + } color: showBarBackground ? Appearance.colors.colLayer0 : "transparent" height: barHeight @@ -425,23 +429,27 @@ Scope { // Round decorators Item { - anchors.left: parent.left - anchors.right: parent.right - anchors.top: barContent.bottom + anchors { + left: parent.left + right: parent.right + // top: barContent.bottom + top: ConfigOptions.bar.bottom ? undefined : barContent.bottom + bottom: ConfigOptions.bar.bottom ? barContent.top : undefined + } height: Appearance.rounding.screenRounding RoundCorner { anchors.top: parent.top anchors.left: parent.left size: Appearance.rounding.screenRounding - corner: cornerEnum.topLeft + corner: ConfigOptions.bar.bottom ? cornerEnum.bottomLeft : cornerEnum.topLeft color: showBarBackground ? Appearance.colors.colLayer0 : "transparent" } RoundCorner { anchors.top: parent.top anchors.right: parent.right size: Appearance.rounding.screenRounding - corner: cornerEnum.topRight + corner: ConfigOptions.bar.bottom ? cornerEnum.bottomRight : cornerEnum.topRight color: showBarBackground ? Appearance.colors.colLayer0 : "transparent" } } diff --git a/.config/quickshell/modules/common/ConfigOptions.qml b/.config/quickshell/modules/common/ConfigOptions.qml index 9db16c2e..20822326 100644 --- a/.config/quickshell/modules/common/ConfigOptions.qml +++ b/.config/quickshell/modules/common/ConfigOptions.qml @@ -22,10 +22,11 @@ Singleton { } property QtObject bar: QtObject { + property bool bottom: false // Instead of top + property bool borderless: true property int batteryLowThreshold: 20 property string topLeftIcon: "spark" // Options: distro, spark property bool showBackground: true - property bool borderless: false property QtObject resources: QtObject { property bool alwaysShowSwap: true property bool alwaysShowCpu: false diff --git a/.config/quickshell/modules/mediaControls/MediaControls.qml b/.config/quickshell/modules/mediaControls/MediaControls.qml index 9c21bf71..81b1d62d 100644 --- a/.config/quickshell/modules/mediaControls/MediaControls.qml +++ b/.config/quickshell/modules/mediaControls/MediaControls.qml @@ -87,7 +87,8 @@ Scope { WlrLayershell.namespace: "quickshell:mediaControls" anchors { - top: true + top: !ConfigOptions.bar.bottom + bottom: ConfigOptions.bar.bottom left: true } mask: Region { diff --git a/.config/quickshell/modules/onScreenDisplay/OnScreenDisplayBrightness.qml b/.config/quickshell/modules/onScreenDisplay/OnScreenDisplayBrightness.qml index a70663b7..decb7537 100644 --- a/.config/quickshell/modules/onScreenDisplay/OnScreenDisplayBrightness.qml +++ b/.config/quickshell/modules/onScreenDisplay/OnScreenDisplayBrightness.qml @@ -65,7 +65,10 @@ Scope { WlrLayershell.layer: WlrLayer.Overlay color: "transparent" - anchors.top: true + anchors { + top: !ConfigOptions.bar.bottom + bottom: ConfigOptions.bar.bottom + } mask: Region { item: osdValuesWrapper } diff --git a/.config/quickshell/modules/onScreenDisplay/OnScreenDisplayVolume.qml b/.config/quickshell/modules/onScreenDisplay/OnScreenDisplayVolume.qml index 01d22ba8..e1904354 100644 --- a/.config/quickshell/modules/onScreenDisplay/OnScreenDisplayVolume.qml +++ b/.config/quickshell/modules/onScreenDisplay/OnScreenDisplayVolume.qml @@ -67,7 +67,10 @@ Scope { WlrLayershell.layer: WlrLayer.Overlay color: "transparent" - anchors.top: true + anchors { + top: !ConfigOptions.bar.bottom + bottom: ConfigOptions.bar.bottom + } mask: Region { item: osdValuesWrapper } diff --git a/.config/quickshell/modules/overview/Overview.qml b/.config/quickshell/modules/overview/Overview.qml index 965e151a..fe7ba1e5 100644 --- a/.config/quickshell/modules/overview/Overview.qml +++ b/.config/quickshell/modules/overview/Overview.qml @@ -90,7 +90,11 @@ Scope { ColumnLayout { id: columnLayout visible: GlobalStates.overviewOpen - anchors.horizontalCenter: parent.horizontalCenter + anchors { + horizontalCenter: parent.horizontalCenter + top: !ConfigOptions.bar.bottom ? parent.top : null + bottom: ConfigOptions.bar.bottom ? parent.bottom : null + } Keys.onPressed: (event) => { if (event.key === Qt.Key_Escape) {