baobeld/lux-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move bar to unified window setup

Browse source
This commit is contained in:
Benjamin Palko 2025-08-31 21:27:29 -04:00
parent 75f1fc1905
commit 4011f4b5c8
2 changed files with 75 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
modules/Shell.qml
View file

@ -4,8 +4,9 @@ import "launcher"
import "pomodoro"
import "powermenu"
import "storybook"
import Quickshell
import QtQuick
import Quickshell
import Quickshell.Wayland
Variants {
model: Quickshell.screens
@ -15,7 +16,65 @@ Variants {
required property ShellScreen modelData
Bar {}
PanelWindow {
id: exclusionZone
anchors.top: true
anchors.left: true
anchors.right: true
implicitWidth: bar.width
implicitHeight: bar.height
color: "transparent"
}
PanelWindow {
id: topWindow
anchors.top: true
anchors.left: true
anchors.right: true
anchors.bottom: true
color: 'transparent'
WlrLayershell.exclusionMode: ExclusionMode.Ignore
WlrLayershell.layer: WlrLayer.Top
mask: Region {
width: topWindow.width
height: topWindow.height
intersection: Intersection.Xor
regions: regions.instances
}
Variants {
id: regions
model: panels.children
Region {
required property Item modelData
x: modelData.x
y: modelData.y
width: modelData.width
height: modelData.height
intersection: Intersection.Subtract
}
}
Item {
id: panels
anchors.fill: parent
Bar {
id: bar
}
}
}
Launcher {}
Pomodoro {}
PowerMenu {}

55
modules/bar/Bar.qml
View file

@ -3,55 +3,29 @@ import "components/bluetooth"
import "components/hyprland"
import "components/notifications"
import "components/tray"
import qs.components
import qs.config
import QtQuick
import QtQuick.Layouts
import Quickshell
import Quickshell.Wayland
PanelWindow {
id: parentWindow
StyledWrapperRectangle {
id: root
anchors.top: true
anchors.left: true
anchors.right: true
implicitHeight: Dimensions.bar.height
color: 'transparent'
WlrLayershell.layer: WlrLayer.Top
Item {
anchors.fill: parent
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.leftMargin: Dimensions.bar.horizontalMargins
anchors.rightMargin: Dimensions.bar.horizontalMargins
anchors.topMargin: Dimensions.bar.verticalMargins
anchors.bottomMargin: Dimensions.bar.verticalMargins
Rectangle {
id: background
anchors.fill: parent
color: Theme.palette.base300
radius: Dimensions.radius
margin: 4
border {
color: Theme.palette.base100
width: Dimensions.bar.border
pixelAligned: true
}
}
RowLayout {
RowLayout {
id: leftbar
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: Dimensions.bar.horizontalPadding
anchors.topMargin: Dimensions.bar.verticalPadding
anchors.bottomMargin: Dimensions.bar.verticalPadding
spacing: Dimensions.bar.spacing
SystemLogo {
@ -66,11 +40,7 @@ PanelWindow {
RowLayout {
id: centerbar
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
anchors.topMargin: Dimensions.bar.verticalPadding
anchors.bottomMargin: Dimensions.bar.verticalPadding
Layout.alignment: Qt.AlignHCenter
spacing: Dimensions.bar.spacing
@ -80,12 +50,7 @@ PanelWindow {
RowLayout {
id: rightbar
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: Dimensions.bar.horizontalPadding
anchors.topMargin: Dimensions.bar.verticalPadding
anchors.bottomMargin: Dimensions.bar.verticalPadding
Layout.alignment: Qt.AlignRight
spacing: Dimensions.bar.spacing