mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
actiondrawer: fix swipearea references
This commit is contained in:
parent
dc84693bfb
commit
d9495bc714
2 changed files with 3 additions and 5 deletions
|
|
@ -132,10 +132,6 @@ Item {
|
||||||
*/
|
*/
|
||||||
signal runPendingNotificationAction()
|
signal runPendingNotificationAction()
|
||||||
|
|
||||||
onOpenedChanged: {
|
|
||||||
if (opened) swipeArea.focus = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
property real oldOffset
|
property real oldOffset
|
||||||
onOffsetChanged: {
|
onOffsetChanged: {
|
||||||
if (offset < 0) {
|
if (offset < 0) {
|
||||||
|
|
@ -149,7 +145,7 @@ Item {
|
||||||
oldOffset = offset;
|
oldOffset = offset;
|
||||||
|
|
||||||
// close panel immediately after panel is not shown, and the flickable is not being dragged
|
// close panel immediately after panel is not shown, and the flickable is not being dragged
|
||||||
if (opened && root.offset <= 0 && !swipeArea.moving && !drawerAnimation.running) {
|
if (opened && root.offset <= 0 && !contentContainer.swipeAreaMoving && !drawerAnimation.running) {
|
||||||
root.state = "";
|
root.state = "";
|
||||||
offset = 0;
|
offset = 0;
|
||||||
focus = false;
|
focus = false;
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,8 @@ Item {
|
||||||
readonly property real minimizedQuickSettingsOffset: contentContainerLoader.minimizedQuickSettingsOffset
|
readonly property real minimizedQuickSettingsOffset: contentContainerLoader.minimizedQuickSettingsOffset
|
||||||
readonly property real maximizedQuickSettingsOffset: contentContainerLoader.maximizedQuickSettingsOffset
|
readonly property real maximizedQuickSettingsOffset: contentContainerLoader.maximizedQuickSettingsOffset
|
||||||
|
|
||||||
|
readonly property bool swipeAreaMoving: swipeAreaBase.moving || swipeAreaPortrait.moving
|
||||||
|
|
||||||
Kirigami.Theme.colorSet: Kirigami.Theme.View
|
Kirigami.Theme.colorSet: Kirigami.Theme.View
|
||||||
Kirigami.Theme.inherit: false
|
Kirigami.Theme.inherit: false
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue