Compare commits

..

No commits in common. "d92a46035d05843f1acef9eddc63e3be09a3c6dc" and "3c9f6e78cc8a0af240a5ac7a0ed0cb517f2bbb5a" have entirely different histories.

3 changed files with 34 additions and 69 deletions

View file

@ -10,7 +10,6 @@ PanelWindow {
required property var screen
color: "transparent"
layer: WlrLayer.Bottom
anchors {
top: true
@ -34,31 +33,39 @@ PanelWindow {
spacing: 0
// ---- left ----
RowLayout {
Item {
Layout.fillWidth: true
Layout.fillHeight: true
RowLayout {
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
spacing: 8
M.Workspaces {}
// M.Workspaces {}
M.Tray { bar: bar }
M.WindowTitle { Layout.maximumWidth: 400 }
Item { Layout.fillWidth: true }
}
}
// ---- center ----
RowLayout {
spacing: 8
Layout.alignment: Qt.AlignVCenter
M.Clock {}
M.Notifications {}
}
// ---- right ----
RowLayout {
Item {
Layout.fillWidth: true
Layout.fillHeight: true
RowLayout {
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
spacing: 12
Item { Layout.fillWidth: true }
M.Mpris {}
M.Volume {}
M.Bluetooth {}
@ -76,3 +83,4 @@ PanelWindow {
}
}
}
}

View file

@ -1,14 +1,7 @@
import QtQuick
import QtQuick.Layouts
// Niri workspace support disabled Quickshell.Services.Niri not available
RowLayout {
spacing: 4
Loader {
source: "WorkspacesInner.qml"
onStatusChanged: {
if (status === Loader.Error)
source = "";
}
}
}

View file

@ -1,36 +0,0 @@
import QtQuick
import QtQuick.Layouts
import Quickshell.Services.Niri
import "." as M
RowLayout {
spacing: 4
Repeater {
model: Niri.workspaces
delegate: Rectangle {
required property var modelData
implicitWidth: 24
implicitHeight: 20
radius: 4
color: modelData.isFocused
? M.Theme.base0D
: (modelData.isActive ? M.Theme.base03 : M.Theme.base02)
Text {
anchors.centerIn: parent
text: modelData.idx ?? modelData.id
color: modelData.isFocused ? M.Theme.base00 : M.Theme.base05
font.pixelSize: M.Theme.fontSize
font.family: M.Theme.fontFamily
}
MouseArea {
anchors.fill: parent
onClicked: Niri.dispatch(["action", "focus-workspace", String(modelData.id)])
}
}
}
}