mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
Merge branch 'main' of https://github.com/noctalia-dev/noctalia-shell
This commit is contained in:
@@ -214,11 +214,8 @@ ShellRoot {
|
||||
if (!modelData || !modelData.name)
|
||||
return false
|
||||
|
||||
var monitors = Settings.data.bar.monitors || []
|
||||
var result = monitors.length === 0 || monitors.includes(modelData.name)
|
||||
|
||||
Logger.d("Shell", "NFullScreenWindow Loader for", modelData?.name, "- shouldBeActive:", result, "- monitors:", JSON.stringify(monitors))
|
||||
return result
|
||||
Logger.d("Shell", "NFullScreenWindow activated for", modelData?.name)
|
||||
return true
|
||||
}
|
||||
|
||||
property bool windowLoaded: false
|
||||
@@ -289,9 +286,16 @@ ShellRoot {
|
||||
}
|
||||
|
||||
// BarExclusionZone - created after NFullScreenWindow has fully loaded
|
||||
// Must also be disabled when bar is hidden
|
||||
// Disabled when bar is hidden or not configured for this screen
|
||||
Loader {
|
||||
active: parent.windowLoaded && parent.shouldBeActive && BarService.isVisible
|
||||
active: {
|
||||
if (!parent.windowLoaded || !parent.shouldBeActive || !BarService.isVisible)
|
||||
return false
|
||||
|
||||
// Check if bar is configured for this screen
|
||||
var monitors = Settings.data.bar.monitors || []
|
||||
return monitors.length === 0 || monitors.includes(modelData?.name)
|
||||
}
|
||||
asynchronous: false
|
||||
|
||||
sourceComponent: BarExclusionZone {
|
||||
|
||||
Reference in New Issue
Block a user