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

mgallien · web-flow · commit 951a7b34bf79 · 2025-01-08T14:42:48.000+01:00
[stable-3.15] Fix "open local or group folders" menu not showing
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 number	Diff line change
`@@ -97,8 +97,8 @@ ApplicationWindow {`
`97`	`97`
`98`	`98`	`if (Systray.isOpen) {`
`99`	`99`	`trayWindowHeader.currentAccountHeaderButton.accountMenu.close();`
`100`		`- appsMenu.close();`
`101`		`- openLocalFolderButton.closeMenu()`
	`100`	`+ trayWindowHeader.appsMenu.close();`
	`101`	`+ trayWindowHeader.openLocalFolderButton.closeMenu()`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -222,8 +222,8 @@ HeaderButton {`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`Component.onCompleted: {`
`225`		`- foldersMenuLoader.openMenu = open`
`226`		`- foldersMenuLoader.closeMenu = close`
	`225`	`+ foldersMenuLoader.openMenu = function() { open() }`
	`226`	`+ foldersMenuLoader.closeMenu = function() { close() }`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`Connections {`