Remove internal list view and scrollview from apps menu

This was breaking proper hover handling and selection

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml
index 591e5aefd15b03dcbbdcb5752b55c33c4b5d3f9c..6ddd7e9e41c5680436327528552c05e2e0aab3ba 100644 (file)
--- a/src/gui/tray/MainWindow.qml
+++ b/src/gui/tray/MainWindow.qml
@@ -568,7 +568,7 @@ ApplicationWindow {
                     icon.source: "image://svgimage-custom-color/more-apps.svg/" + palette.windowText\r
 \r
                     onClicked: {\r
-                        if(appsMenuListView.count <= 0) {\r
+                        if(appsMenu.count <= 0) {\r
                             UserModel.openCurrentAccountServer()\r
                         } else if (appsMenu.visible) {\r
                             appsMenu.close()\r
@@ -589,47 +589,21 @@ ApplicationWindow {
                         height: implicitHeight + y > Style.trayWindowHeight ? Style.trayWindowHeight - y : implicitHeight\r
                         closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape\r
 \r
-                        background: Rectangle {\r
-                            border.color: palette.dark\r
-                            radius: Style.halfTrayWindowRadius\r
-                            color: palette.window\r
-                        }\r
-\r
-                        contentItem: ScrollView {\r
-                            id: appsMenuScrollView\r
-                            ScrollBar.horizontal.policy: ScrollBar.AlwaysOff\r
-\r
-                            data: WheelHandler {\r
-                                target: appsMenuScrollView.contentItem\r
-                            }\r
-                            ListView {\r
-                                id: appsMenuListView\r
-                                implicitHeight: contentHeight\r
-                                model: UserAppsModel\r
-                                interactive: true\r
-                                clip: true\r
-                                currentIndex: appsMenu.currentIndex\r
-                                delegate: MenuItem {\r
-                                    id: appEntry\r
-                                    anchors.left: parent.left\r
-                                    anchors.right: parent.right\r
-                                    text: model.appName\r
-                                    font.pixelSize: Style.topLinePixelSize\r
-                                    icon.source: model.appIconUrl\r
-                                    icon.color: palette.windowText\r
-                                    onTriggered: UserAppsModel.openAppUrl(appUrl)\r
-                                    hoverEnabled: true\r
-                                    Accessible.role: Accessible.MenuItem\r
-                                    Accessible.name: qsTr("Open %1 in browser").arg(model.appName)\r
-                                    Accessible.onPressAction: appEntry.triggered()\r
-\r
-                                    background: Rectangle {\r
-                                        anchors.fill: parent\r
-                                        anchors.margins: 1\r
-                                        color: appEntry.hovered ? palette.highlight : palette.window\r
-                                        radius: Style.halfTrayWindowRadius\r
-                                    }\r
-                                }\r
+                        Repeater { \r
+                            model: UserAppsModel\r
+                            delegate: MenuItem {\r
+                                id: appEntry\r
+                                anchors.left: parent.left\r
+                                anchors.right: parent.right\r
+                                text: model.appName\r
+                                font.pixelSize: Style.topLinePixelSize\r
+                                icon.source: model.appIconUrl\r
+                                icon.color: palette.windowText\r
+                                onTriggered: UserAppsModel.openAppUrl(appUrl)\r
+                                hoverEnabled: true\r
+                                Accessible.role: Accessible.MenuItem\r
+                                Accessible.name: qsTr("Open %1 in browser").arg(model.appName)\r
+                                Accessible.onPressAction: appEntry.triggered()\r
                             }\r
                         }\r
                     }\r