marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

taskswitcher: Port to EffectTogglableState

Browse source
This commit is contained in:
Devin Lin 2023-11-15 22:45:23 -08:00
parent 335ae705ca
commit a3cd470efc
3 changed files with 45 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

165
kwin/mobiletaskswitcher/mobiletaskswitchereffect.cpp
View file

@ -15,56 +15,38 @@ namespace KWin
{
MobileTaskSwitcherEffect::MobileTaskSwitcherEffect()
: m_shutdownTimer(new QTimer(this))
: m_taskSwitcherState{new EffectTogglableState(this)}
, m_border{new EffectTogglableTouchBorder{m_taskSwitcherState}}
, m_shutdownTimer{new QTimer{this}}
{
m_shutdownTimer->setSingleShot(true);
connect(m_shutdownTimer, &QTimer::timeout, this, &MobileTaskSwitcherEffect::realDeactivate);
auto gesture = new EffectTogglableGesture{m_taskSwitcherState};
gesture->addTouchpadSwipeGesture(SwipeDirection::Up, 3);
gesture->addTouchscreenSwipeGesture(SwipeDirection::Up, 1);
const QKeySequence defaultToggleShortcut = Qt::META | Qt::Key_C;
m_toggleAction = new QAction(this);
m_toggleAction->setObjectName(QStringLiteral("Mobile Task Switcher"));
m_toggleAction->setText(i18n("Toggle Mobile Task Switcher"));
connect(m_toggleAction, &QAction::triggered, this, &MobileTaskSwitcherEffect::toggle);
KGlobalAccel::self()->setDefaultShortcut(m_toggleAction, {defaultToggleShortcut});
KGlobalAccel::self()->setShortcut(m_toggleAction, {defaultToggleShortcut});
m_realtimeToggleAction = new QAction(this);
connect(m_realtimeToggleAction, &QAction::triggered, this, [this]() {
if (m_status == Status::Deactivating) {
if (m_partialActivationFactor < 0.5) {
deactivate(false);
} else {
cancelPartialDeactivate();
}
} else if (m_status == Status::Activating) {
if (m_partialActivationFactor > 0.5) {
activate();
} else {
cancelPartialActivate();
}
connect(m_taskSwitcherState, &EffectTogglableState::inProgressChanged, this, &MobileTaskSwitcherEffect::gestureInProgressChanged);
connect(m_taskSwitcherState, &EffectTogglableState::partialActivationFactorChanged, this, &MobileTaskSwitcherEffect::partialActivationFactorChanged);
connect(m_taskSwitcherState, &EffectTogglableState::statusChanged, this, [this](EffectTogglableState::Status status) {
if (status == EffectTogglableState::Status::Activating || status == EffectTogglableState::Status::Active) {
setRunning(true);
setDBusState(true);
}
if (status == EffectTogglableState::Status::Inactive) {
deactivate(true);
}
});
auto progressCallback = [this](qreal progress) {
if (!effects->hasActiveFullScreenEffect() || effects->activeFullScreenEffect() == this) {
switch (m_status) {
case Status::Inactive:
case Status::Activating:
partialActivate(progress);
break;
case Status::Active:
case Status::Deactivating:
partialDeactivate(progress);
break;
}
}
};
// configure close timer
m_shutdownTimer->setSingleShot(true);
connect(m_shutdownTimer, &QTimer::timeout, this, &MobileTaskSwitcherEffect::realDeactivate);
effects->registerTouchpadPinchShortcut(PinchDirection::Contracting, 4, m_realtimeToggleAction, progressCallback);
effects->registerTouchscreenSwipeShortcut(SwipeDirection::Up, 3, m_realtimeToggleAction, progressCallback);
// toggle action
const QKeySequence defaultToggleShortcut = Qt::META | Qt::Key_C;
auto toggleAction = m_taskSwitcherState->toggleAction();
toggleAction->setObjectName(QStringLiteral("Mobile Task Switcher"));
toggleAction->setText(i18n("Toggle Mobile Task Switcher"));
KGlobalAccel::self()->setDefaultShortcut(toggleAction, {defaultToggleShortcut});
KGlobalAccel::self()->setShortcut(toggleAction, {defaultToggleShortcut});
connect(effects, &EffectsHandler::screenAboutToLock, this, &MobileTaskSwitcherEffect::realDeactivate);
@ -84,36 +66,13 @@ void MobileTaskSwitcherEffect::reconfigure(ReconfigureFlags)
effects->unreserveElectricBorder(border, this);
}
for (const ElectricBorder &border : std::as_const(m_touchBorderActivate)) {
effects->unregisterTouchBorder(border, m_toggleAction);
}
m_borderActivate.clear();
m_touchBorderActivate.clear();
const QList<int> activateBorders = {ElectricBorder::ElectricBottom};
for (const int &border : activateBorders) {
m_borderActivate.append(ElectricBorder(border));
effects->reserveElectricBorder(ElectricBorder(border), this);
}
const QList<int> touchActivateBorders = {ElectricBorder::ElectricBottom};
for (const int &border : touchActivateBorders) {
m_touchBorderActivate.append(ElectricBorder(border));
effects->registerRealtimeTouchBorder(ElectricBorder(border),
m_realtimeToggleAction,
[this](ElectricBorder border, const QPointF &deltaProgress, const Output *screen) {
if (m_status == Status::Active) {
return;
}
const int maxDelta = 500; // Arbitrary logical pixels value seems to behave better than scaledScreenSize
if (border == ElectricTop || border == ElectricBottom) {
partialActivate(std::min(1.0, std::abs(deltaProgress.y()) / maxDelta));
} else {
partialActivate(std::min(1.0, std::abs(deltaProgress.x()) / maxDelta));
}
});
}
}
int MobileTaskSwitcherEffect::requestedEffectChainPosition() const
@ -123,6 +82,9 @@ int MobileTaskSwitcherEffect::requestedEffectChainPosition() const
bool MobileTaskSwitcherEffect::borderActivated(ElectricBorder border)
{
if (m_borderActivate.contains(border)) {
return true;
}
return false;
}
@ -152,9 +114,7 @@ void MobileTaskSwitcherEffect::activate()
return;
}
m_status = Status::Active;
setRunning(true);
setDBusState(true);
m_taskSwitcherState->activate();
}
void MobileTaskSwitcherEffect::deactivate(bool deactivateInstantly)
@ -166,49 +126,15 @@ void MobileTaskSwitcherEffect::deactivate(bool deactivateInstantly)
}
}
m_shutdownTimer->start(animationTime(deactivateInstantly ? 0 : 200));
setGestureInProgress(false);
setPartialActivationFactor(0.0);
setDBusState(false);
}
void MobileTaskSwitcherEffect::partialActivate(qreal factor)
{
if (effects->isScreenLocked()) {
return;
}
m_status = Status::Activating;
setPartialActivationFactor(factor);
setGestureInProgress(true);
setRunning(true);
}
void MobileTaskSwitcherEffect::partialDeactivate(qreal factor)
{
m_status = Status::Deactivating;
setPartialActivationFactor(1.0 - factor);
setGestureInProgress(true);
}
void MobileTaskSwitcherEffect::cancelPartialDeactivate()
{
activate();
}
void MobileTaskSwitcherEffect::cancelPartialActivate()
{
deactivate(false);
}
void MobileTaskSwitcherEffect::realDeactivate()
{
setRunning(false);
m_status = Status::Inactive;
m_taskSwitcherState->deactivate();
if (m_taskSwitcherState->status() == EffectTogglableState::Status::Inactive) {
setRunning(false);
setDBusState(false);
}
}
void MobileTaskSwitcherEffect::quickDeactivate()
@ -231,29 +157,12 @@ void MobileTaskSwitcherEffect::setAnimationDuration(int duration)
bool MobileTaskSwitcherEffect::gestureInProgress() const
{
return m_gestureInProgress;
}
void MobileTaskSwitcherEffect::setGestureInProgress(bool gesture)
{
if (m_gestureInProgress != gesture) {
m_gestureInProgress = gesture;
Q_EMIT gestureInProgressChanged();
}
return m_taskSwitcherState->inProgress();
}
qreal MobileTaskSwitcherEffect::partialActivationFactor() const
{
return m_partialActivationFactor;
}
void MobileTaskSwitcherEffect::setPartialActivationFactor(qreal factor)
{
if (m_partialActivationFactor != factor) {
qDebug() << factor;
m_partialActivationFactor = factor;
Q_EMIT partialActivationFactorChanged();
}
return m_taskSwitcherState->partialActivationFactor();
}
void MobileTaskSwitcherEffect::setDBusState(bool active)

19
kwin/mobiletaskswitcher/mobiletaskswitchereffect.h
View file

@ -6,6 +6,8 @@
#include <libkwineffects/effects.h>
#include <libkwineffects/quickeffect.h>
#include <libkwineffects/effect.h>
#include <libkwineffects/effecttogglablestate.h>
#include <span>
@ -34,10 +36,8 @@ public:
void setAnimationDuration(int duration);
bool gestureInProgress() const;
void setGestureInProgress(bool gesture);
qreal partialActivationFactor() const;
void setPartialActivationFactor(qreal factor);
int requestedEffectChainPosition() const override;
bool borderActivated(ElectricBorder border) override;
@ -49,10 +49,6 @@ public:
public Q_SLOTS:
void activate();
void realDeactivate();
void partialActivate(qreal factor);
void cancelPartialActivate();
void partialDeactivate(qreal factor);
void cancelPartialDeactivate();
void deactivate(bool deactivateInstantly);
void quickDeactivate();
void toggle();
@ -63,18 +59,17 @@ Q_SIGNALS:
void partialActivationFactorChanged();
private:
EffectTogglableState *const m_taskSwitcherState;
EffectTogglableTouchBorder *const m_border;
QList<ElectricBorder> m_borderActivate;
QAction *m_realtimeToggleAction = nullptr;
QAction *m_toggleAction = nullptr;
QList<QKeySequence> m_toggleShortcut;
Status m_status = Status::Inactive;
;
QTimer *m_shutdownTimer;
QList<ElectricBorder> m_borderActivate;
QList<ElectricBorder> m_touchBorderActivate;
int m_animationDuration = 400;
qreal m_partialActivationFactor = 0;
bool m_gestureInProgress = false;
};
} // namespace KWin

2
kwin/mobiletaskswitcher/qml/TaskSwitcher.qml
View file

@ -277,7 +277,7 @@ FocusScope {
implicitWidth: Kirigami.Units.iconSizes.large
implicitHeight: Kirigami.Units.iconSizes.large
source: "window"
// color: "white"
color: "white"
}
Kirigami.Heading {