mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
Fix action drawer not opening on click in convergence
open() alone does not set intendedToBeVisible, so the drawer immediately closes itself. Call the proper toggle path instead. Also hide the drag handle since convergence users click.
This commit is contained in:
parent
d8f9924c73
commit
b77bf41cdc
3 changed files with 12 additions and 2 deletions
|
|
@ -34,8 +34,9 @@ MobileShell.SwipeArea {
|
||||||
}
|
}
|
||||||
|
|
||||||
function startSwipeWithPoint(point) {
|
function startSwipeWithPoint(point) {
|
||||||
// if the user swiped from the top left, otherwise it's from the top right
|
if (ShellSettings.Settings.convergenceModeEnabled) {
|
||||||
if (point.x < root.width / 2) {
|
actionDrawer.openToPinnedMode = false;
|
||||||
|
} else if (point.x < root.width / 2) {
|
||||||
actionDrawer.openToPinnedMode = ShellSettings.Settings.actionDrawerTopLeftMode == ShellSettings.Settings.Pinned;
|
actionDrawer.openToPinnedMode = ShellSettings.Settings.actionDrawerTopLeftMode == ShellSettings.Settings.Pinned;
|
||||||
} else {
|
} else {
|
||||||
actionDrawer.openToPinnedMode = ShellSettings.Settings.actionDrawerTopRightMode == ShellSettings.Settings.Pinned;
|
actionDrawer.openToPinnedMode = ShellSettings.Settings.actionDrawerTopRightMode == ShellSettings.Settings.Pinned;
|
||||||
|
|
@ -69,6 +70,8 @@ MobileShell.SwipeArea {
|
||||||
if (actionDrawer.intendedToBeVisible) {
|
if (actionDrawer.intendedToBeVisible) {
|
||||||
actionDrawer.close();
|
actionDrawer.close();
|
||||||
} else {
|
} else {
|
||||||
|
actionDrawer.openToPinnedMode = false;
|
||||||
|
actionDrawer.intendedToBeVisible = true;
|
||||||
actionDrawer.open();
|
actionDrawer.open();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -100,6 +100,7 @@ MobileShell.BaseItem {
|
||||||
id: handle
|
id: handle
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
|
visible: !ShellSettings.Settings.convergenceModeEnabled
|
||||||
opacity: brightnessPressedValue
|
opacity: brightnessPressedValue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,10 @@ Item {
|
||||||
target: MobileShellState.ShellDBusClient
|
target: MobileShellState.ShellDBusClient
|
||||||
|
|
||||||
function onOpenActionDrawerRequested() {
|
function onOpenActionDrawerRequested() {
|
||||||
|
if (ShellSettings.Settings.convergenceModeEnabled) {
|
||||||
|
drawer.actionDrawer.openToPinnedMode = false;
|
||||||
|
drawer.actionDrawer.intendedToBeVisible = true;
|
||||||
|
}
|
||||||
drawer.actionDrawer.open();
|
drawer.actionDrawer.open();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -129,6 +133,8 @@ Item {
|
||||||
if (drawer.actionDrawer.intendedToBeVisible) {
|
if (drawer.actionDrawer.intendedToBeVisible) {
|
||||||
drawer.actionDrawer.close();
|
drawer.actionDrawer.close();
|
||||||
} else {
|
} else {
|
||||||
|
drawer.actionDrawer.openToPinnedMode = false;
|
||||||
|
drawer.actionDrawer.intendedToBeVisible = true;
|
||||||
drawer.actionDrawer.open();
|
drawer.actionDrawer.open();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue