From b9d4ff6455e87b18645f4af085a6d84cabf1baf8 Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Sun, 10 Nov 2024 21:01:28 -0800 Subject: [PATCH] Revert "homescreens: Use WheelHandler on app list" This reverts commit 11a45f94d2ad3091bd24df436133464091d60e0b. --- .../folio/package/contents/ui/AppDrawerGrid.qml | 9 --------- .../halcyon/package/contents/ui/GridAppList.qml | 11 +---------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/containments/homescreens/folio/package/contents/ui/AppDrawerGrid.qml b/containments/homescreens/folio/package/contents/ui/AppDrawerGrid.qml index cecf3b62..04ee8813 100644 --- a/containments/homescreens/folio/package/contents/ui/AppDrawerGrid.qml +++ b/containments/homescreens/folio/package/contents/ui/AppDrawerGrid.qml @@ -46,15 +46,6 @@ MobileShell.GridView { interactive: (dragging || !atYBeginning) // allow us to drag to the top && folio.HomeScreenState.swipeState !== Folio.HomeScreenState.SwipingAppDrawerGrid - // Handle mouse wheel scrolling - Kirigami.WheelHandler { - target: root - filterMouseEvents: false - // `20 * Qt.styleHints.wheelScrollLines` is the default speed. - horizontalStepSize: 20 * Qt.styleHints.wheelScrollLines - verticalStepSize: 20 * Qt.styleHints.wheelScrollLines - } - Connections { target: folio.HomeScreenState diff --git a/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml b/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml index 2942475a..14498c3a 100644 --- a/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml +++ b/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml @@ -8,7 +8,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls 2.15 as Controls import org.kde.plasma.components 3.0 as PC3 -import org.kde.kirigami as Kirigami +import org.kde.kirigami 2.10 as Kirigami import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.private.mobileshell.state as MobileShellState @@ -69,15 +69,6 @@ MobileShell.GridView { } } - // Handle mouse wheel scrolling - Kirigami.WheelHandler { - target: gridView - filterMouseEvents: false - // `20 * Qt.styleHints.wheelScrollLines` is the default speed. - horizontalStepSize: 20 * Qt.styleHints.wheelScrollLines - verticalStepSize: 20 * Qt.styleHints.wheelScrollLines - } - PC3.Label { id: metrics text: "M\nM"