Commit 7a6792aa authored by Eric Edlund's avatar Eric Edlund Committed by Marco Martin
Browse files

Make desktop grid effect check for active effects before responding to gestures

parent 5cf8db26
......@@ -67,6 +67,9 @@ DesktopGridEffect::DesktopGridEffect()
QAction* a = m_gestureAction;
connect(a, &QAction::triggered, this, [this]() {
if (effects->hasActiveFullScreenEffect() && effects->activeFullScreenEffect() != this) {
return;
}
if ((qreal(timeline.currentTime()) / qreal(timeline.duration())) > 0.5) {
if (effects->isScreenLocked()) {
return;
......@@ -83,7 +86,12 @@ DesktopGridEffect::DesktopGridEffect()
}
});
effects->registerRealtimeTouchpadPinchShortcut(PinchDirection::Contracting, 4, a, [this](qreal cb) {
if (activated) return;
if (activated) {
return;
}
if (effects->hasActiveFullScreenEffect() && effects->activeFullScreenEffect() != this) {
return;
}
if (timeline.currentValue() == 0) {
activated = true;
......@@ -102,7 +110,6 @@ DesktopGridEffect::DesktopGridEffect()
setup();
activated = false;
}
timeline.setCurrentTime(timeline.duration() * cb);
effects->addRepaintFull();
});
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment