mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2025-12-05 21:15:38 -05:00
rebase woes
This commit is contained in:
@@ -465,9 +465,11 @@ Item {
|
|||||||
|
|
||||||
onVisibleChanged: {
|
onVisibleChanged: {
|
||||||
if (visible) {
|
if (visible) {
|
||||||
|
if (currentTrayMenu) {
|
||||||
|
currentTrayMenu.showMenu = false
|
||||||
|
}
|
||||||
PopoutManager.closeAllPopouts()
|
PopoutManager.closeAllPopouts()
|
||||||
ModalManager.closeAllModalsExcept(null)
|
ModalManager.closeAllModalsExcept(null)
|
||||||
TrayMenuManager.closeTrayMenus()
|
|
||||||
updatePosition()
|
updatePosition()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -781,10 +783,6 @@ Item {
|
|||||||
|
|
||||||
function close() {
|
function close() {
|
||||||
showMenu = false
|
showMenu = false
|
||||||
if (root.overflowWasOpenBeforeTrayMenu) {
|
|
||||||
root.menuOpen = true
|
|
||||||
}
|
|
||||||
root.overflowWasOpenBeforeTrayMenu = false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function closeWithAction() {
|
function closeWithAction() {
|
||||||
@@ -918,9 +916,9 @@ Item {
|
|||||||
|
|
||||||
onVisibleChanged: {
|
onVisibleChanged: {
|
||||||
if (visible) {
|
if (visible) {
|
||||||
|
root.menuOpen = false
|
||||||
PopoutManager.closeAllPopouts()
|
PopoutManager.closeAllPopouts()
|
||||||
ModalManager.closeAllModalsExcept(null)
|
ModalManager.closeAllModalsExcept(null)
|
||||||
TrayMenuManager.closeOverflowMenus()
|
|
||||||
updatePosition()
|
updatePosition()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user