vinzenz/nova-shell
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bar modules own active state, fix circular effectiveVisible deadlock in BarGroup

Browse source
This commit is contained in:
Damocles 2026-04-26 18:45:11 +02:00
parent 7eaa50327f
commit 7e594b7f8d
24 changed files with 52 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

3
shell/modules/BacklightModule.qml
View file

@ -7,8 +7,7 @@ import "../applets" as C
M.BarModule {
id: root
spacing: S.Theme.moduleSpacing
opacity: S.Modules.backlight.enable && S.BacklightService.available ? 1 : 0
visible: opacity > 0
active: S.Modules.backlight.enable && S.BacklightService.available
tooltip: "Brightness: " + percent + "%"
panelNamespace: "nova-backlight"
panelTitle: "Brightness"

53
shell/modules/Bar.qml
View file

@ -120,12 +120,8 @@ PanelWindow {
M.BarGroup {
M.PrivacyModule {}
M.ClockModule {
visible: S.Modules.clock.enable
}
M.NotificationsModule {
visible: S.Modules.notifications.enable
}
M.ClockModule {}
M.NotificationsModule {}
}
}
@ -141,7 +137,6 @@ PanelWindow {
leftEdge: true
M.WorkspacesModule {
bar: bar
visible: S.Modules.workspaces.enable
}
}
M.BarGroup {
@ -182,60 +177,38 @@ PanelWindow {
M.MprisModule {
bar: bar
}
M.VolumeModule {
visible: S.Modules.volume.enable
}
M.VolumeModule {}
}
// Connectivity
M.BarGroup {
M.NetworkModule {
visible: S.Modules.network.enable
}
M.NetworkModule {}
M.BluetoothModule {}
}
// Controls
M.BarGroup {
M.BacklightModule {}
M.PowerProfileModule {
visible: S.Modules.powerProfile.enable
}
M.IdleInhibitorModule {
visible: S.Modules.idleInhibitor.enable
}
M.PowerProfileModule {}
M.IdleInhibitorModule {}
}
// Stats
M.BarGroup {
M.CpuModule {
visible: S.Modules.cpu.enable
}
M.MemoryModule {
visible: S.Modules.memory.enable
}
M.CpuModule {}
M.MemoryModule {}
M.GpuModule {}
M.TemperatureModule {
visible: S.Modules.temperature.enable
}
M.WeatherModule {
visible: S.Modules.weather.enable
}
M.DiskModule {
visible: S.Modules.disk.enable
}
M.TemperatureModule {}
M.WeatherModule {}
M.DiskModule {}
}
// Power + Dock
M.BarGroup {
rightEdge: true
M.BatteryModule {}
M.DockModule {
visible: S.Modules.dock.enable
}
M.PowerModule {
visible: S.Modules.power.enable
}
M.DockModule {}
M.PowerModule {}
}
}
}

13
shell/modules/BarGroup.qml
View file

@ -27,7 +27,18 @@ Item {
readonly property real _blr: S.Theme.radius
readonly property real _brr: S.Theme.radius
visible: row.visibleChildren.length > 0
// Check children's `active` instead of visibleChildren to avoid circular
// effectiveVisible dependency: if the BarGroup is invisible, children's
// effectiveVisible is always false, so visibleChildren stays empty and
// the group can never become visible again. `active` is a plain property
// on BarModule that is not affected by the parent visibility chain.
visible: {
for (let i = 0; i < row.children.length; i++) {
if (row.children[i].active)
return true;
}
return false;
}
implicitWidth: row.implicitWidth + _pad * 2
implicitHeight: S.Theme.barHeight - 3 - _pad

4
shell/modules/BarModule.qml
View file

@ -14,6 +14,10 @@ import "../services" as S
// For content resize grace, call keepPanelOpen(ms).
Row {
id: root
property bool active: true
opacity: active ? 1 : 0
visible: opacity > 0
property string tooltip: ""
property bool _hovered: false
property color accentColor: parent?.accentColor ?? S.Theme.base05

3
shell/modules/BatteryModule.qml
View file

@ -7,8 +7,7 @@ import "../applets" as C
M.BarModule {
id: root
spacing: S.Theme.moduleSpacing
opacity: S.Modules.battery.enable && S.BatteryService.available ? 1 : 0
visible: opacity > 0
active: S.Modules.battery.enable && S.BatteryService.available
tooltip: "Battery: " + Math.round(S.BatteryService.percent) + "%" + (S.BatteryService.charging ? " (charging)" : "")
panelNamespace: "nova-battery"
panelTitle: "Battery"

3
shell/modules/BluetoothModule.qml
View file

@ -7,8 +7,7 @@ import "../applets" as C
M.BarModule {
id: root
spacing: S.Theme.moduleSpacing
opacity: S.Modules.bluetooth.enable && S.BluetoothService.state !== "unavailable" ? 1 : 0
visible: opacity > 0
active: S.Modules.bluetooth.enable && S.BluetoothService.state !== "unavailable"
tooltip: {
if (S.BluetoothService.state === "connected")
return "Bluetooth: " + S.BluetoothService.device;

1
shell/modules/ClockModule.qml
View file

@ -6,6 +6,7 @@ import "../applets" as C
M.BarModule {
id: root
active: S.Modules.clock.enable
spacing: S.Theme.moduleSpacing
tooltip: Qt.formatDateTime(clock.date, "dddd, dd. MMMM yyyy")
panelNamespace: "nova-clock"

1
shell/modules/CpuModule.qml
View file

@ -6,6 +6,7 @@ import "../applets" as C
M.BarModule {
id: root
active: S.Modules.cpu.enable
spacing: Math.max(1, S.Theme.moduleSpacing - 2)
tooltip: "CPU: " + S.SystemStats.cpuUsage + "% @ " + S.SystemStats.cpuFreqGhz.toFixed(2) + " GHz"
panelNamespace: "nova-cpu"

1
shell/modules/DiskModule.qml
View file

@ -6,6 +6,7 @@ import "../applets" as C
M.BarModule {
id: root
active: S.Modules.disk.enable
spacing: Math.max(1, S.Theme.moduleSpacing - 2)
tooltip: "Disk: " + _rootPct + "% used"
panelNamespace: "nova-disk"

1
shell/modules/DockModule.qml
View file

@ -4,6 +4,7 @@ import "../services" as S
M.BarModule {
id: root
active: S.Modules.dock.enable
tooltip: S.DockState.open ? "Close dock" : "Open dock"
onTapped: S.DockState.toggle()

2
shell/modules/GpuModule.qml
View file

@ -7,7 +7,7 @@ import "../applets" as C
M.BarModule {
id: root
spacing: Math.max(1, S.Theme.moduleSpacing - 2)
visible: S.Modules.gpu.enable && S.SystemStats.gpuAvailable
active: S.Modules.gpu.enable && S.SystemStats.gpuAvailable
tooltip: "GPU: " + S.SystemStats.gpuUsage + "%"
panelNamespace: "nova-gpu"
panelTitle: "GPU"

1
shell/modules/IdleInhibitorModule.qml
View file

@ -5,6 +5,7 @@ import "../services" as S
M.BarModule {
id: root
active: S.Modules.idleInhibitor.enable
tooltip: {
const parts = ["Idle inhibition: " + (S.IdleInhibitService.active ? "active" : "inactive")];
if (S.IdleInhibitService.inhibitors)

1
shell/modules/MemoryModule.qml
View file

@ -6,6 +6,7 @@ import "../applets" as C
M.BarModule {
id: root
active: S.Modules.memory.enable
spacing: Math.max(1, S.Theme.moduleSpacing - 2)
tooltip: "Memory: " + usedGb.toFixed(1) + " / " + totalGb.toFixed(1) + " GB"
panelNamespace: "nova-memory"

3
shell/modules/MprisModule.qml
View file

@ -9,8 +9,7 @@ import "../applets" as C
M.BarModule {
id: root
spacing: S.Theme.moduleSpacing
opacity: S.Modules.mpris.enable && S.MprisService.player !== null ? 1 : 0
visible: opacity > 0
active: S.Modules.mpris.enable && S.MprisService.player !== null
tooltip: S.MprisService.player ? (S.MprisService.player.trackTitle || S.MprisService.player.identity || "Media") + (S.MprisService.playing ? " (playing)" : " (paused)") : "Media"
panelNamespace: "nova-mpris"
panelTitle: "Now Playing"

1
shell/modules/NetworkModule.qml
View file

@ -6,6 +6,7 @@ import "../applets" as C
M.BarModule {
id: root
active: S.Modules.network.enable
spacing: S.Theme.moduleSpacing
tooltip: {
if (state === "wifi")

1
shell/modules/NotificationsModule.qml
View file

@ -7,6 +7,7 @@ import "../applets" as C
M.BarModule {
id: root
active: S.Modules.notifications.enable
spacing: S.Theme.moduleSpacing
tooltip: S.NotifService.count > 0 ? "Notifications: " + S.NotifService.count + (S.NotifService.dnd ? " (DND)" : "") : (S.NotifService.dnd ? "Do not disturb" : "No notifications")
panelNamespace: "nova-notifications"

1
shell/modules/PowerModule.qml
View file

@ -7,6 +7,7 @@ import "../applets" as C
M.BarModule {
id: root
active: S.Modules.power.enable
tooltip: "Power menu"
panelNamespace: "nova-power"
panelTitle: "Power"

1
shell/modules/PowerProfileModule.qml
View file

@ -4,6 +4,7 @@ import "../services" as S
M.BarModule {
id: root
active: S.Modules.powerProfile.enable
tooltip: "Power profile: " + (S.PowerProfileService.profile || "unknown")
onTapped: {
const cycle = ["performance", "balanced", "power-saver"];

2
shell/modules/PrivacyModule.qml
View file

@ -35,7 +35,7 @@ M.BarModule {
return false;
}
visible: S.Modules.privacy.enable && (root._videoCapture || root._audioIn)
active: S.Modules.privacy.enable && (root._videoCapture || root._audioIn)
// Screenshare indicator
Text {

1
shell/modules/TemperatureModule.qml
View file

@ -6,6 +6,7 @@ import "../applets" as C
M.BarModule {
id: root
active: S.Modules.temperature.enable
spacing: Math.max(1, S.Theme.moduleSpacing - 2)
tooltip: "Temperature: " + _temp + "\u00B0C"
panelNamespace: "nova-temperature"

24
shell/modules/TrayModule.qml
View file

@ -12,32 +12,14 @@ M.BarModule {
spacing: S.Theme.moduleSpacing + 2
cursorShape: Qt.ArrowCursor
// Workaround: Qt 6 compiled bindings break on `visible` when the expression
// references Repeater.count on a Row-derived component. The binding silently
// dies (imperative overwrite by the engine) and never re-evaluates. Routing
// through a custom property forces the interpreted binding path, which works.
property bool _shouldBeVisible: S.Modules.tray.enable && _trayRepeater.count > 0
visible: _shouldBeVisible
active: S.Modules.tray.enable && _trayRepeater.count > 0
required property var bar
property var _activeMenu: null
// --- debug logging (remove once tray is confirmed working) ---
on_ShouldBeVisibleChanged: console.log("[TrayModule] _shouldBeVisible:", _shouldBeVisible, "actual visible:", visible)
Component.onCompleted: console.log("[TrayModule] created, enable:", S.Modules.tray.enable, "repeater count:", _trayRepeater.count)
onVisibleChanged: console.log("[TrayModule] visible:", visible, "enable:", S.Modules.tray.enable, "count:", _trayRepeater.count)
Connections {
target: _trayRepeater
function onCountChanged() {
console.log("[TrayModule] repeater count:", _trayRepeater.count, "visible:", root.visible, "shouldBe:", S.Modules.tray.enable && _trayRepeater.count > 0);
}
}
Connections {
target: SystemTray.items
function onValuesChanged() {
console.log("[TrayModule] model valuesChanged, values.length:", SystemTray.items.values.length, "repeater count:", _trayRepeater.count);
}
}
onActiveChanged: console.log("[TrayModule] active:", active, "count:", _trayRepeater.count)
onVisibleChanged: console.log("[TrayModule] visible:", visible)
Repeater {
id: _trayRepeater

1
shell/modules/VolumeModule.qml
View file

@ -7,6 +7,7 @@ import "../applets" as C
M.BarModule {
id: root
active: S.Modules.volume.enable
spacing: S.Theme.moduleSpacing
tooltip: "Volume: " + Math.round(volume * 100) + "%" + (muted ? " (muted)" : "")
panelNamespace: "nova-volume"

2
shell/modules/WeatherModule.qml
View file

@ -7,7 +7,7 @@ import "../applets" as C
M.BarModule {
id: root
spacing: S.Theme.moduleSpacing
visible: S.Modules.weather.enable && S.WeatherService.available
active: S.Modules.weather.enable && S.WeatherService.available
tooltip: "Weather"
panelNamespace: "nova-weather"
panelTitle: "Weather"

1
shell/modules/WorkspacesModule.qml
View file

@ -6,6 +6,7 @@ import "../services" as S
M.BarModule {
id: root
active: S.Modules.workspaces.enable
spacing: 4
cursorShape: Qt.ArrowCursor