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

libkwineffects: Drop EffectsHandler.windowToDesktop

Browse source 
Use EffectsHandler.windowToDesktops instead.
This commit is contained in:
Vlad Zahorodnii 2023-10-25 01:32:48 +03:00
parent b3b2e96148
commit f2dfac8497
5 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/effects.cpp
View file

@ -715,15 +715,6 @@ void EffectsHandlerImpl::moveWindow(EffectWindow *w, const QPoint &pos, bool sna
}
}
void EffectsHandlerImpl::windowToDesktop(EffectWindow *w, int desktop)
{
QList<uint> desktopIds;
if (desktop != -1) {
desktopIds.append(desktop);
}
windowToDesktops(w, desktopIds);
}
void EffectsHandlerImpl::windowToDesktops(EffectWindow *w, const QList<uint> &desktopIds)
{
auto window = static_cast<EffectWindowImpl *>(w)->window();

1
src/effects.h
View file

@ -64,7 +64,6 @@ public:
void activateWindow(EffectWindow *c) override;
EffectWindow *activeWindow() const override;
void moveWindow(EffectWindow *w, const QPoint &pos, bool snap = false, double snapAdjust = 1.0) override;
void windowToDesktop(EffectWindow *w, int desktop) override;
void windowToScreen(EffectWindow *w, Output *screen) override;
void setShowingDesktop(bool showing) override;

6
src/libkwineffects/kwineffects.h
View file

@ -967,12 +967,6 @@ public:
virtual KWin::EffectWindow *activeWindow() const = 0;
Q_SCRIPTABLE virtual void moveWindow(KWin::EffectWindow *w, const QPoint &pos, bool snap = false, double snapAdjust = 1.0) = 0;
/**
* Moves the window to the specific desktop
* Setting desktop to NET::OnAllDesktops will set the window on all desktops
*/
Q_SCRIPTABLE virtual void windowToDesktop(KWin::EffectWindow *w, int desktop) = 0;
/**
* Moves a window to the given desktops
* On X11, the window will end up on the last window in the list

6
src/plugins/overview/overvieweffect.cpp
View file

@ -362,7 +362,7 @@ void OverviewEffect::grabbedKeyboardEvent(QKeyEvent *keyEvent)
QuickSceneEffect::grabbedKeyboardEvent(keyEvent);
}
void OverviewEffect::swapDesktops(int from, int to)
void OverviewEffect::swapDesktops(uint from, uint to)
{
QList<EffectWindow *> fromList;
QList<EffectWindow *> toList;
@ -377,10 +377,10 @@ void OverviewEffect::swapDesktops(int from, int to)
}
}
for (auto *w : fromList) {
effects->windowToDesktop(w, to);
effects->windowToDesktops(w, {to});
}
for (auto *w : toList) {
effects->windowToDesktop(w, from);
effects->windowToDesktops(w, {from});
}
}

2
src/plugins/overview/overvieweffect.h
View file

@ -59,7 +59,7 @@ public:
void reconfigure(ReconfigureFlags flags) override;
void grabbedKeyboardEvent(QKeyEvent *keyEvent) override;
Q_INVOKABLE void swapDesktops(int from, int to);
Q_INVOKABLE void swapDesktops(uint from, uint to);
Q_SIGNALS:
void animationDurationChanged();