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

Merge remote-tracking branch 'origin/Plasma/5.16'

Browse source
This commit is contained in:
David Faure 2019-08-22 14:10:17 +02:00
commit 36ee672903
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/windowsystem/windoweffects.cpp
View file

@ -81,10 +81,12 @@ void WindowEffects::slideWindow(WId id, KWindowEffects::SlideFromLocation locati
w->setProperty("kwin_slide_offset", offset);
}
#if KWINDOWSYSTEM_VERSION <= QT_VERSION_CHECK(5, 61, 0)
void WindowEffects::slideWindow(QWidget *widget, KWindowEffects::SlideFromLocation location)
{
slideWindow(widget->winId(), location, 0);
}
#endif
QList<QSize> WindowEffects::windowSizes(const QList<WId> &ids)
{

3
plugins/windowsystem/windoweffects.h
View file

@ -19,6 +19,7 @@
*/
#pragma once
#include <KWindowSystem/private/kwindoweffects_p.h>
#include <kwindowsystem_version.h>
namespace KWin
{
@ -31,7 +32,9 @@ public:
bool isEffectAvailable(KWindowEffects::Effect effect) override;
void slideWindow(WId id, KWindowEffects::SlideFromLocation location, int offset) override;
#if KWINDOWSYSTEM_VERSION <= QT_VERSION_CHECK(5, 61, 0)
void slideWindow(QWidget *widget, KWindowEffects::SlideFromLocation location) override;
#endif
QList<QSize> windowSizes(const QList<WId> &ids) override;
void presentWindows(WId controller, const QList<WId> &ids) override;
void presentWindows(WId controller, int desktop = NET::OnAllDesktops) override;