lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(OSD): when controlcenter is open, before skipping OSD check that the cards(vol/bright) are really enabled

Browse Source
This commit is contained in:
Lemmy
2026-03-15 22:42:10 -04:00
parent 3b5410103a
commit 1b2ec2e4a2
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/OSD/OSD.qml
+12 -4
View File
@@ -188,8 +188,12 @@ Variants {
var brightnessPanel = PanelService.getPanel("brightnessPanel", root.modelData);
var controlCenterPanel = PanelService.getPanel("controlCenterPanel", root.modelData);
if ((brightnessPanel && brightnessPanel.isPanelOpen) || (controlCenterPanel && controlCenterPanel.isPanelOpen)) {
if (brightnessPanel && brightnessPanel.isPanelOpen)
return;
if (controlCenterPanel && controlCenterPanel.isPanelOpen) {
var cards = Settings.data.controlCenter.cards || [];
if (cards.some(c => c.enabled && c.id === "brightness-card"))
return;
}
showOSD(OSD.Type.Brightness);
}
@@ -213,12 +217,16 @@ Variants {
if (!isTypeEnabled(type))
return;
// Suppress Audio OSD if Audio Panel or Control Center is open
// Suppress Audio OSD if Audio Panel or Control Center (with audio card) is open
if (type === OSD.Type.Volume || type === OSD.Type.InputVolume) {
var audioPanel = PanelService.getPanel("audioPanel", root.modelData);
var controlCenterPanel = PanelService.getPanel("controlCenterPanel", root.modelData);
if ((audioPanel && audioPanel.isPanelOpen) || (controlCenterPanel && controlCenterPanel.isPanelOpen)) {
if (audioPanel && audioPanel.isPanelOpen)
return;
var controlCenterPanel = PanelService.getPanel("controlCenterPanel", root.modelData);
if (controlCenterPanel && controlCenterPanel.isPanelOpen) {
var cards = Settings.data.controlCenter.cards || [];
if (cards.some(c => c.enabled && c.id === "audio-card"))
return;
}
}