Skip to content

Commit bf6b3ca

Browse files
committed
fix apps menu not closing when the window is hidden, and make group folders menu work again
this change resolves this ReferenceError when the window is being closed: ``` 2025-01-08 10:56:40:389 [ warning default qrc:/qml/src/gui/tray/MainWindow.qml:100 ]: qrc:/qml/src/gui/tray/MainWindow.qml:100: ReferenceError: appsMenu is not defined ``` I also noticed that the "Open local or group folders" dropdown menu wouldn't show up due to this error: ``` 2025-01-08 10:56:23:327 [ warning default qrc:/qml/src/gui/tray/TrayFoldersMenuButton.qml:33 ]: qrc:/qml/src/gui/tray/TrayFoldersMenuButton.qml:33: Error: Cannot call method QQuickPopup::open on QQuickLoader_QML_48(0x5569fb4648d0) ``` --> wrapped the calls to the open/close methods in a closure Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
1 parent 19eab9d commit bf6b3ca

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/gui/tray/MainWindow.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ ApplicationWindow {
100100

101101
if (Systray.isOpen) {
102102
trayWindowHeader.currentAccountHeaderButton.accountMenu.close();
103-
appsMenu.close();
104-
openLocalFolderButton.closeMenu()
103+
trayWindowHeader.appsMenu.close();
104+
trayWindowHeader.openLocalFolderButton.closeMenu()
105105
}
106106
}
107107

src/gui/tray/TrayFoldersMenuButton.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ HeaderButton {
222222
}
223223

224224
Component.onCompleted: {
225-
foldersMenuLoader.openMenu = open
226-
foldersMenuLoader.closeMenu = close
225+
foldersMenuLoader.openMenu = function() { open() }
226+
foldersMenuLoader.closeMenu = function() { close() }
227227
}
228228

229229
Connections {

src/gui/tray/TrayWindowHeader.qml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ Rectangle {
2626
id: root
2727

2828
readonly property alias currentAccountHeaderButton: currentAccountHeaderButton
29+
readonly property alias openLocalFolderButton: openLocalFolderButton
30+
readonly property alias appsMenu: appsMenu
2931

3032
color: Style.currentUserHeaderColor
3133

0 commit comments

Comments
 (0)