NPanel: clear openedPanel attempt
This commit is contained in:
parent
bb0f1e84ce
commit
7fafda4747
2 changed files with 11 additions and 1 deletions
|
|
@ -12,9 +12,12 @@ 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: ({})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Register this panel
|
// Register this panel
|
||||||
function registerPanel(panel) {
|
function registerPanel(panel) {
|
||||||
registeredPanels[panel.objectName] = panel
|
registeredPanels[panel.objectName] = panel
|
||||||
|
|
@ -33,9 +36,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
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -125,6 +125,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