marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-07-26 14:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

homescreen: Fix swipe down gesture conflict with taskpanel

Browse source
This commit is contained in:
Devin Lin 2021-12-26 00:21:42 -05:00
parent 54f10f9f13
commit 7a1a32724b
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
components/mobilehomescreencomponents/qml/private/DragGestureHandler.qml
View file

@ -52,19 +52,23 @@ DragHandler {
} }
if (__scrollDirection !== DragGestureHandler.Left && __scrollDirection !== DragGestureHandler.Right) { if (__scrollDirection !== DragGestureHandler.Left && __scrollDirection !== DragGestureHandler.Right) {
// if swipe up, scroll app drawer
root.appDrawer.flickable.contentY = Math.min(root.appDrawer.drawerTopMargin, Math.max(0, -translation.y));
if (translation.y < 0 && MobileShell.TopPanelControls.inSwipe) { // ensure it does not conflict with task switcher
MobileShell.TopPanelControls.endSwipe(); if (!MobileShell.HomeScreenControls.taskSwitcher.visible) {
} // if swipe up, scroll app drawer
root.appDrawer.flickable.contentY = Math.min(root.appDrawer.drawerTopMargin, Math.max(0, -translation.y));
// if swipe down, scroll top panel if (translation.y < 0 && MobileShell.TopPanelControls.inSwipe) {
if (translation.y > 0) { MobileShell.TopPanelControls.endSwipe();
if (!MobileShell.TopPanelControls.inSwipe) { }
MobileShell.TopPanelControls.startSwipe();
// if swipe down, scroll top panel
if (translation.y > 0) {
if (!MobileShell.TopPanelControls.inSwipe) {
MobileShell.TopPanelControls.startSwipe();
}
MobileShell.TopPanelControls.requestRelativeScroll(translation.y - __oldTranslationY);
} }
MobileShell.TopPanelControls.requestRelativeScroll(translation.y - __oldTranslationY);
} }
} }
} }