Compare commits

...

2 commits

Author SHA1 Message Date
Damocles
a1a8d0cf24 current app icon 2026-04-12 15:41:03 +02:00
Damocles
f6e61ffa3b filter workspaces by monitor 2026-04-12 15:38:36 +02:00
3 changed files with 38 additions and 8 deletions

View file

@ -50,7 +50,7 @@ PanelWindow {
anchors.verticalCenter: parent.verticalCenter
spacing: M.Theme.barSpacing
M.Workspaces { visible: M.Modules.workspaces }
M.Workspaces { bar: bar; visible: M.Modules.workspaces }
M.Tray {
bar: bar
visible: M.Modules.tray

View file

@ -1,17 +1,23 @@
import QtQuick
import QtQuick.Effects
import Quickshell
import Quickshell.Io
import Quickshell.Widgets
import "." as M
M.BarLabel {
M.BarSection {
id: root
spacing: M.Theme.moduleSpacing
label: root._title
color: M.Theme.base05
tooltip: root._appId ? root._appId + "\n" + root._title : root._title
elide: Text.ElideRight
property string _title: ""
property string _appId: ""
readonly property string _iconSource: {
if (!root._appId) return "";
const entry = DesktopEntries.heuristicLookup(root._appId);
return entry ? Quickshell.iconPath(entry.icon) : "";
}
// Initial state niri event-stream doesn't replay current focus
Process {
@ -56,4 +62,23 @@ M.BarLabel {
}
}
}
IconImage {
visible: root._iconSource !== ""
source: root._iconSource
implicitSize: M.Theme.fontSize + 2
anchors.verticalCenter: parent.verticalCenter
layer.enabled: true
layer.effect: MultiEffect {
colorization: 1.0
colorizationColor: M.Theme.base05
}
}
M.BarLabel {
label: root._title
color: M.Theme.base05
elide: Text.ElideRight
anchors.verticalCenter: parent.verticalCenter
}
}

View file

@ -1,4 +1,5 @@
import QtQuick
import Quickshell
import Quickshell.Io
import "." as M
@ -6,8 +7,12 @@ Row {
id: root
spacing: 4
property var _workspaces: []
required property var bar
property var _allWorkspaces: []
property int _activeId: -1
readonly property string _output: bar.screen?.name ?? ""
readonly property var _workspaces: _allWorkspaces.filter(w => w.output === root._output)
// Initial state
Process {
@ -18,7 +23,7 @@ Row {
onStreamFinished: {
try {
const ws = JSON.parse(text);
root._workspaces = ws.sort((a, b) => a.idx - b.idx);
root._allWorkspaces = ws.sort((a, b) => a.idx - b.idx);
for (const w of ws) {
if (w.is_focused)
root._activeId = w.id;
@ -39,7 +44,7 @@ Row {
try {
const ev = JSON.parse(line);
if (ev.WorkspacesChanged !== undefined) {
root._workspaces = ev.WorkspacesChanged.workspaces
root._allWorkspaces = ev.WorkspacesChanged.workspaces
.sort((a, b) => a.idx - b.idx);
} else if (ev.WorkspaceActivated !== undefined) {
if (ev.WorkspaceActivated.focused)