Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5b0e499b9f | ||
|
|
e48cd78adf | ||
|
|
b1d0be5d31 |
5 changed files with 6 additions and 20 deletions
|
|
@ -281,6 +281,7 @@ in
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
home.packages = [
|
home.packages = [
|
||||||
|
cfg.package
|
||||||
self.packages.${pkgs.stdenv.hostPlatform.system}.nova-shell-cli
|
self.packages.${pkgs.stdenv.hostPlatform.system}.nova-shell-cli
|
||||||
pkgs.nerd-fonts.symbols-only
|
pkgs.nerd-fonts.symbols-only
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -135,15 +135,11 @@ PanelWindow {
|
||||||
M.BarGroup {
|
M.BarGroup {
|
||||||
id: workspacesGroup
|
id: workspacesGroup
|
||||||
leftEdge: true
|
leftEdge: true
|
||||||
M.WorkspacesModule {
|
M.WorkspacesModule {}
|
||||||
bar: bar
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
M.BarGroup {
|
M.BarGroup {
|
||||||
leftEdge: !workspacesGroup.visible
|
leftEdge: !workspacesGroup.visible
|
||||||
M.TrayModule {
|
M.TrayModule {}
|
||||||
bar: bar
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
M.BarGroup {
|
M.BarGroup {
|
||||||
id: _windowTitleGroup
|
id: _windowTitleGroup
|
||||||
|
|
@ -174,9 +170,7 @@ PanelWindow {
|
||||||
|
|
||||||
// Media
|
// Media
|
||||||
M.BarGroup {
|
M.BarGroup {
|
||||||
M.MprisModule {
|
M.MprisModule {}
|
||||||
bar: bar
|
|
||||||
}
|
|
||||||
M.VolumeModule {}
|
M.VolumeModule {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -55,8 +55,6 @@ M.BarModule {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
required property var bar
|
|
||||||
|
|
||||||
M.BarIcon {
|
M.BarIcon {
|
||||||
icon: S.MprisService.playing ? "\uF04B" : (S.MprisService.player?.playbackState === MprisPlaybackState.Paused ? "\uDB80\uDFE4" : "\uDB81\uDCDB")
|
icon: S.MprisService.playing ? "\uF04B" : (S.MprisService.player?.playbackState === MprisPlaybackState.Paused ? "\uDB80\uDFE4" : "\uDB81\uDCDB")
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
|
|
||||||
|
|
@ -14,13 +14,8 @@ M.BarModule {
|
||||||
|
|
||||||
active: S.Modules.tray.enable && _trayRepeater.count > 0
|
active: S.Modules.tray.enable && _trayRepeater.count > 0
|
||||||
|
|
||||||
required property var bar
|
|
||||||
property var _activeMenu: null
|
property var _activeMenu: null
|
||||||
|
|
||||||
// --- debug logging (remove once tray is confirmed working) ---
|
|
||||||
onActiveChanged: console.log("[TrayModule] active:", active, "count:", _trayRepeater.count)
|
|
||||||
onVisibleChanged: console.log("[TrayModule] visible:", visible)
|
|
||||||
|
|
||||||
Repeater {
|
Repeater {
|
||||||
id: _trayRepeater
|
id: _trayRepeater
|
||||||
model: SystemTray.items
|
model: SystemTray.items
|
||||||
|
|
@ -104,7 +99,7 @@ M.BarModule {
|
||||||
M.TrayMenu {
|
M.TrayMenu {
|
||||||
accentColor: root.accentColor
|
accentColor: root.accentColor
|
||||||
handle: iconItem.modelData.menu
|
handle: iconItem.modelData.menu
|
||||||
screen: root.bar.screen
|
screen: QsWindow.window?.screen ?? null
|
||||||
anchorX: iconItem.mapToGlobal(iconItem.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0)
|
anchorX: iconItem.mapToGlobal(iconItem.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0)
|
||||||
onDismissed: {
|
onDismissed: {
|
||||||
menuLoader.active = false;
|
menuLoader.active = false;
|
||||||
|
|
|
||||||
|
|
@ -10,11 +10,9 @@ M.BarModule {
|
||||||
spacing: 4
|
spacing: 4
|
||||||
cursorShape: Qt.ArrowCursor
|
cursorShape: Qt.ArrowCursor
|
||||||
|
|
||||||
required property var bar
|
|
||||||
|
|
||||||
property var _allWorkspaces: []
|
property var _allWorkspaces: []
|
||||||
property int _activeId: -1
|
property int _activeId: -1
|
||||||
readonly property string _output: bar.screen?.name ?? ""
|
readonly property string _output: QsWindow.window?.screen?.name ?? ""
|
||||||
readonly property var _workspaces: _allWorkspaces.filter(w => w.output === root._output)
|
readonly property var _workspaces: _allWorkspaces.filter(w => w.output === root._output)
|
||||||
|
|
||||||
// Initial state
|
// Initial state
|
||||||
|
|
|
||||||
Reference in a new issue