From 0d2884678e20c7f489d1ca97c0cc7da36f6a7224 Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Wed, 8 Jan 2025 10:55:21 +0100 Subject: [PATCH 1/2] remove old vim swap file Signed-off-by: Jyrki Gadinger --- .gitignore | 1 + src/gui/tray/.wheelhandler.h.swo | Bin 16384 -> 0 bytes 2 files changed, 1 insertion(+) delete mode 100644 src/gui/tray/.wheelhandler.h.swo diff --git a/.gitignore b/.gitignore index 85a87ed91464e..9a97cd7c4e665 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ doc/_build/* *.kdev4 admin/win/nsi/l10n/pofiles/*.po *.swp +*.swo *~$ build* cscope.* diff --git a/src/gui/tray/.wheelhandler.h.swo b/src/gui/tray/.wheelhandler.h.swo deleted file mode 100644 index ab3ea46e26d47ebdb21f4aefe743e69578e63ae6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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 From 2f3dcb5c96c1e55dae088d92d9751c096a8db92a Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Wed, 8 Jan 2025 10:55:47 +0100 Subject: [PATCH 2/2] 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 --- src/gui/tray/MainWindow.qml | 4 ++-- src/gui/tray/TrayFoldersMenuButton.qml | 4 ++-- src/gui/tray/TrayWindowHeader.qml | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml index c02dd1b73cbe7..627a6a66212b1 100644 --- a/src/gui/tray/MainWindow.qml +++ b/src/gui/tray/MainWindow.qml @@ -97,8 +97,8 @@ ApplicationWindow { if (Systray.isOpen) { trayWindowHeader.currentAccountHeaderButton.accountMenu.close(); - appsMenu.close(); - openLocalFolderButton.closeMenu() + trayWindowHeader.appsMenu.close(); + trayWindowHeader.openLocalFolderButton.closeMenu() } } diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml index 6da6f9ca914cb..f98cad514b920 100644 --- a/src/gui/tray/TrayFoldersMenuButton.qml +++ b/src/gui/tray/TrayFoldersMenuButton.qml @@ -222,8 +222,8 @@ HeaderButton { } Component.onCompleted: { - foldersMenuLoader.openMenu = open - foldersMenuLoader.closeMenu = close + foldersMenuLoader.openMenu = function() { open() } + foldersMenuLoader.closeMenu = function() { close() } } Connections { diff --git a/src/gui/tray/TrayWindowHeader.qml b/src/gui/tray/TrayWindowHeader.qml index 10080212c1f56..9ba808e5b7019 100644 --- a/src/gui/tray/TrayWindowHeader.qml +++ b/src/gui/tray/TrayWindowHeader.qml @@ -26,6 +26,8 @@ Rectangle { id: root readonly property alias currentAccountHeaderButton: currentAccountHeaderButton + readonly property alias openLocalFolderButton: openLocalFolderButton + readonly property alias appsMenu: appsMenu color: Style.currentUserHeaderColor