Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-24 21:42:51 -05:00
Code Packages Releases Activity

systemtray: fix UI thread freeze when opening menu on Hyprland

Browse Source 
- Similar pattern as fix from Noctalia
This commit is contained in:
bbedward
2025-11-15 17:57:23 -05:00
parent d11868b99f
commit 4cb652abd9
1 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml
View File

@@ -645,11 +645,43 @@ Item {
property bool showMenu: false
property var menuHandle: null
property bool shouldLoadMenu: false
property var menuItems: []
ListModel { id: entryStack }
function topEntry() {
return entryStack.count ? entryStack.get(entryStack.count - 1).handle : null
}
onShouldLoadMenuChanged: {
if (shouldLoadMenu) {
loadMenuItemsSafely()
}
}
function loadMenuItemsSafely() {
menuLoadTimer.start()
}
Timer {
id: menuLoadTimer
interval: 50
repeat: false
onTriggered: {
try {
const currentOpener = entryStack.count ? subOpener : rootOpener
if (currentOpener && currentOpener.children && currentOpener.children.values) {
const values = currentOpener.children.values
if (values && values.length > 0) {
menuRoot.menuItems = [...values]
}
}
} catch (e) {
console.warn("Failed to load menu items:", e)
}
}
}
function showForTrayItem(item, anchor, screen, atBottom, vertical, axisObj) {
trayItem = item
anchorItem = anchor
@@ -657,7 +689,12 @@ Item {
isAtBottom = atBottom
isVertical = vertical
axis = axisObj
menuHandle = item?.menu
if (item && item.menu) {
menuHandle = item.menu
}
menuItems = []
if (parentScreen) {
for (var i = 0; i < Quickshell.screens.length; i++) {
@@ -669,6 +706,7 @@ Item {
}
}
shouldLoadMenu = true
showMenu = true
}
@@ -690,17 +728,17 @@ Item {
entryStack.append({ handle: entry });
const h = entry.menu || entry;
if (h && typeof h.updateLayout === "function") h.updateLayout();
menuItems = []
submenuHydrator.menu = h;
submenuHydrator.open();
Qt.callLater(() => submenuHydrator.close());
shouldLoadMenu = true
}
function goBack() {
if (!entryStack.count) return;
entryStack.remove(entryStack.count - 1);
menuItems = []
Qt.callLater(() => loadMenuItemsSafely())
}
width: 0
@@ -879,14 +917,16 @@ Item {
}
}
QsMenuAnchor {
id: submenuHydrator
anchor.window: menuWindow
}
QsMenuOpener {
id: rootOpener
menu: menuRoot.menuHandle
onMenuChanged: {
if (menuRoot.shouldLoadMenu && !entryStack.count) {
menuRoot.menuItems = []
Qt.callLater(() => menuRoot.loadMenuItemsSafely())
}
}
}
QsMenuOpener {
@@ -895,6 +935,13 @@ Item {
const e = menuRoot.topEntry();
return e ? (e.menu || e) : null;
}
onMenuChanged: {
if (menuRoot.shouldLoadMenu && entryStack.count) {
menuRoot.menuItems = []
Qt.callLater(() => menuRoot.loadMenuItemsSafely())
}
}
}
@@ -1005,10 +1052,7 @@ Item {
}
Repeater {
model: entryStack.count
? (subOpener.children ? subOpener.children
: (menuRoot.topEntry()?.children || []))
: rootOpener.children
model: menuRoot.menuItems
Rectangle {
property var menuEntry: modelData