mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-28 15:32:50 -05:00
dankbar: keep sticky reveal when tray menu is open
This commit is contained in:
@@ -25,6 +25,7 @@ Item {
|
|||||||
|
|
||||||
property alias barVariants: barVariants
|
property alias barVariants: barVariants
|
||||||
property var hyprlandOverviewLoader: null
|
property var hyprlandOverviewLoader: null
|
||||||
|
property bool systemTrayMenuOpen: false
|
||||||
|
|
||||||
function triggerControlCenterOnFocusedScreen() {
|
function triggerControlCenterOnFocusedScreen() {
|
||||||
let focusedScreenName = ""
|
let focusedScreenName = ""
|
||||||
@@ -444,7 +445,7 @@ Item {
|
|||||||
return item.loader.item[item.prop]
|
return item.loader.item[item.prop]
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
})
|
}) || root.systemTrayMenuOpen
|
||||||
}
|
}
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
@@ -470,7 +471,10 @@ Item {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onHasActivePopoutChanged: {
|
onHasActivePopoutChanged: {
|
||||||
if (!hasActivePopout && autoHide && !topBarMouseArea.containsMouse) {
|
if (hasActivePopout) {
|
||||||
|
revealSticky = true
|
||||||
|
revealHold.stop()
|
||||||
|
} else if (autoHide && !topBarMouseArea.containsMouse) {
|
||||||
revealSticky = true
|
revealSticky = true
|
||||||
revealHold.restart()
|
revealHold.restart()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -678,7 +678,21 @@ Item {
|
|||||||
|
|
||||||
property var currentTrayMenu: null
|
property var currentTrayMenu: null
|
||||||
|
|
||||||
|
Connections {
|
||||||
|
target: currentTrayMenu
|
||||||
|
enabled: currentTrayMenu !== null
|
||||||
|
function onShowMenuChanged() {
|
||||||
|
if (parentWindow && typeof parentWindow.systemTrayMenuOpen !== "undefined") {
|
||||||
|
parentWindow.systemTrayMenuOpen = currentTrayMenu.showMenu
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function showForTrayItem(item, anchor, screen, atBottom, vertical, axisObj) {
|
function showForTrayItem(item, anchor, screen, atBottom, vertical, axisObj) {
|
||||||
|
if (parentWindow && typeof parentWindow.systemTrayMenuOpen !== "undefined") {
|
||||||
|
parentWindow.systemTrayMenuOpen = true
|
||||||
|
}
|
||||||
|
|
||||||
if (currentTrayMenu) {
|
if (currentTrayMenu) {
|
||||||
currentTrayMenu.destroy()
|
currentTrayMenu.destroy()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user