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

Tray capsule hidden if empty + formatting

Browse source
This commit is contained in:
quadbyte 2025-08-19 08:01:59 -04:00
parent 1993e28c18
commit fdf475cabc
3 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Commons/Settings.qml
View file

@ -53,7 +53,8 @@ Singleton {
} }
} }
if (!hasValidBarMonitor) { if (!hasValidBarMonitor) {
Logger.log("Settings", "No configured bar monitors found on system, clearing bar monitor list to show on all screens") Logger.log("Settings",
"No configured bar monitors found on system, clearing bar monitor list to show on all screens")
adapter.bar.monitors = [] adapter.bar.monitors = []
} else { } else {
Logger.log("Settings", "Found valid bar monitors, keeping configuration") Logger.log("Settings", "Found valid bar monitors, keeping configuration")
@ -222,7 +223,7 @@ Singleton {
property string fontFamily: "Roboto" // Family for all text property string fontFamily: "Roboto" // Family for all text
} }
// Scaling (not stored as JsonObject) // Scaling (not stored inside JsonObject, or it crashes)
property var monitorsScaling: { property var monitorsScaling: {
} }

10
Modules/Background/ScreenCorners.qml
View file

@ -43,12 +43,10 @@ NLoader {
} }
margins { margins {
top: (Settings.data.bar.monitors.includes(modelData.name) top: (Settings.data.bar.monitors.includes(modelData.name) || (Settings.data.bar.monitors.length === 0))
|| (Settings.data.bar.monitors.length === 0)) && Settings.data.bar.barPosition === "top" && Settings.data.bar.barPosition === "top" ? Math.floor(Style.barHeight * scaling) : 0
? Math.floor(Style.barHeight * scaling) : 0 bottom: (Settings.data.bar.monitors.includes(modelData.name) || (Settings.data.bar.monitors.length === 0))
bottom: (Settings.data.bar.monitors.includes(modelData.name) && Settings.data.bar.barPosition === "bottom" ? Math.floor(Style.barHeight * scaling) : 0
|| (Settings.data.bar.monitors.length === 0)) && Settings.data.bar.barPosition === "bottom"
? Math.floor(Style.barHeight * scaling) : 0
} }
// Source we want to show only as a ring // Source we want to show only as a ring

2
Modules/Bar/Tray.qml
View file

@ -12,7 +12,7 @@ import qs.Widgets
Rectangle { Rectangle {
readonly property real itemSize: 24 * scaling readonly property real itemSize: 24 * scaling
visible: Settings.data.bar.showTray visible: Settings.data.bar.showTray && SystemTray.items.length > 0
width: tray.width + Style.marginM * scaling * 2 width: tray.width + Style.marginM * scaling * 2
height: Math.round(Style.capsuleHeight * scaling) height: Math.round(Style.capsuleHeight * scaling)