Merge pull request #7732 from nextcloud/backport/7730/stable-3.15

[stable-3.15] Fix "open local or group folders" menu not showing
nextcloud · Jan 8, 2025 · 951a7b3 · 951a7b3
2 parents be8a159 + 2f3dcb5
commit 951a7b3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ doc/_build/* @@
     *.kdev4
     admin/win/nsi/l10n/pofiles/*.po
     *.swp
+    *.swo
     *~$
     build*
     cscope.*
@@ Expand Down @@