Merge branch 'main' of https://github.com/noctalia-dev/noctalia-shell
This commit is contained in:
commit
ac7092943c
3 changed files with 15 additions and 4 deletions
|
|
@ -11,10 +11,13 @@ Item {
|
||||||
// Using Wayland protocols to get focused window then determine which screen it's on.
|
// Using Wayland protocols to get focused window then determine which screen it's on.
|
||||||
function getActiveScreen() {
|
function getActiveScreen() {
|
||||||
const activeWindow = ToplevelManager.activeToplevel
|
const activeWindow = ToplevelManager.activeToplevel
|
||||||
if (activeWindow.screens.length > 0) {
|
if (activeWindow && activeWindow.screens.length > 0) {
|
||||||
return activeWindow.screens[0]
|
var screen = activeWindow.screens[0]
|
||||||
|
return screen
|
||||||
}
|
}
|
||||||
return null
|
|
||||||
|
// Fall back to the primary screen
|
||||||
|
return Quickshell.screens[0]
|
||||||
}
|
}
|
||||||
|
|
||||||
IpcHandler {
|
IpcHandler {
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ Singleton {
|
||||||
|
|
||||||
// Currently opened panel
|
// Currently opened panel
|
||||||
property var openedPanel: null
|
property var openedPanel: null
|
||||||
|
readonly property bool hasOpenedPanel: (openedPanel !== null)
|
||||||
|
|
||||||
property var registeredPanels: ({})
|
property var registeredPanels: ({})
|
||||||
|
|
||||||
|
|
@ -33,9 +34,15 @@ Singleton {
|
||||||
|
|
||||||
// Helper to keep only one panel open at any time
|
// Helper to keep only one panel open at any time
|
||||||
function willOpenPanel(panel) {
|
function willOpenPanel(panel) {
|
||||||
if (openedPanel && openedPanel != panel) {
|
if (openedPanel && openedPanel !== panel) {
|
||||||
openedPanel.close()
|
openedPanel.close()
|
||||||
}
|
}
|
||||||
openedPanel = panel
|
openedPanel = panel
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function closedPanel(panel) {
|
||||||
|
if (openedPanel && openedPanel === panel) {
|
||||||
|
openedPanel = null
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -126,6 +126,7 @@ Loader {
|
||||||
root.closed()
|
root.closed()
|
||||||
active = false
|
active = false
|
||||||
useButtonPosition = false // Reset button position usage
|
useButtonPosition = false // Reset button position usage
|
||||||
|
PanelService.closedPanel(root)
|
||||||
}
|
}
|
||||||
|
|
||||||
// -----------------------------------------
|
// -----------------------------------------
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue