yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

effects/windowview: Add ability to deactivate the effect by hitting the same screen edge

Browse source 
In present windows, you could hit the same screen edge that you use to
activate the effect in order to deactivate it.
This commit is contained in:
Vlad Zahorodnii 2022-05-19 10:52:31 +03:00
parent 843b3cfb2a
commit efece0a300
2 changed files with 24 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/effects/windowview/windowvieweffect.cpp
View file

@ -59,12 +59,7 @@ WindowViewEffect::WindowViewEffect()
m_shortcut = KGlobalAccel::self()->shortcut(m_exposeAction);
effects->registerGlobalShortcut(Qt::CTRL | Qt::Key_F9, m_exposeAction);
connect(m_exposeAction, &QAction::triggered, this, [this]() {
if (!isRunning()) {
setMode(ModeCurrentDesktop);
activate();
} else {
deactivate(animationDuration());
}
toggleMode(ModeCurrentDesktop);
});
m_exposeAllAction->setObjectName(QStringLiteral("ExposeAll"));
@ -74,12 +69,7 @@ WindowViewEffect::WindowViewEffect()
m_shortcutAll = KGlobalAccel::self()->shortcut(m_exposeAllAction);
effects->registerGlobalShortcut(Qt::CTRL + Qt::Key_F10, m_exposeAllAction);
connect(m_exposeAllAction, &QAction::triggered, this, [this]() {
if (!isRunning()) {
setMode(ModeAllDesktops);
activate();
} else {
deactivate(animationDuration());
}
toggleMode(ModeAllDesktops);
});
m_exposeClassAction->setObjectName(QStringLiteral("ExposeClass"));
@ -88,12 +78,7 @@ WindowViewEffect::WindowViewEffect()
KGlobalAccel::self()->setShortcut(m_exposeClassAction, QList<QKeySequence>() << (Qt::CTRL | Qt::Key_F7));
effects->registerGlobalShortcut(Qt::CTRL | Qt::Key_F7, m_exposeClassAction);
connect(m_exposeClassAction, &QAction::triggered, this, [this]() {
if (!isRunning()) {
setMode(ModeWindowClass);
activate();
} else {
deactivate(animationDuration());
}
toggleMode(ModeWindowClass);
});
connect(KGlobalAccel::self(), &KGlobalAccel::globalShortcutChanged, this, [this](QAction *action, const QKeySequence &seq) {
if (action->objectName() == QStringLiteral("Expose")) {
@ -263,28 +248,13 @@ void WindowViewEffect::grabbedKeyboardEvent(QKeyEvent *e)
// check for global shortcuts
// HACK: keyboard grab disables the global shortcuts so we have to check for global shortcut (bug 156155)
if (m_mode == ModeCurrentDesktop && m_shortcut.contains(e->key() | e->modifiers())) {
if (!isRunning()) {
setMode(ModeCurrentDesktop);
activate();
} else {
deactivate(animationDuration());
}
toggleMode(ModeCurrentDesktop);
return;
} else if (m_mode == ModeAllDesktops && m_shortcutAll.contains(e->key() | e->modifiers())) {
if (!isRunning()) {
setMode(ModeAllDesktops);
activate();
} else {
deactivate(animationDuration());
}
toggleMode(ModeAllDesktops);
return;
} else if (m_mode == ModeWindowClass && m_shortcutClass.contains(e->key() | e->modifiers())) {
if (!isRunning()) {
setMode(ModeWindowClass);
activate();
} else {
deactivate(animationDuration());
}
toggleMode(ModeWindowClass);
return;
} else if (e->key() == Qt::Key_Escape) {
deactivate(animationDuration());
@ -377,6 +347,20 @@ void WindowViewEffect::setMode(WindowViewEffect::PresentWindowsMode mode)
Q_EMIT modeChanged();
}
void WindowViewEffect::toggleMode(PresentWindowsMode mode)
{
if (!isRunning()) {
setMode(mode);
activate();
} else {
if (m_mode != mode) {
setMode(mode);
} else {
deactivate(animationDuration());
}
}
}
WindowViewEffect::PresentWindowsMode WindowViewEffect::mode() const
{
return m_mode;
@ -389,16 +373,15 @@ bool WindowViewEffect::borderActivated(ElectricBorder border)
}
if (m_borderActivate.contains(border)) {
setMode(ModeCurrentDesktop);
toggleMode(ModeCurrentDesktop);
} else if (m_borderActivateAll.contains(border)) {
setMode(ModeAllDesktops);
toggleMode(ModeAllDesktops);
} else if (m_borderActivateClass.contains(border)) {
setMode(ModeWindowClass);
toggleMode(ModeWindowClass);
} else {
return false;
}
activate();
return true;
}

1
src/effects/windowview/windowvieweffect.h
View file

@ -62,6 +62,7 @@ public:
bool gestureInProgress() const;
void setMode(PresentWindowsMode mode);
void toggleMode(PresentWindowsMode mode);
PresentWindowsMode mode() const;
public Q_SLOTS: