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

Merge branch 'Plasma/5.15'

Browse source
This commit is contained in:
David Edmundson 2019-01-17 23:43:28 +00:00
commit 3e68254eff
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
abstract_client.cpp
View file

@ -501,7 +501,7 @@ void AbstractClient::setDesktops(QVector<VirtualDesktop*> desktops)
{ {
//on x11 we can have only one desktop at a time //on x11 we can have only one desktop at a time
if (kwinApp()->operationMode() == Application::OperationModeX11 && desktops.size() > 1) { if (kwinApp()->operationMode() == Application::OperationModeX11 && desktops.size() > 1) {
desktops = QVector<VirtualDesktop*>({desktops.first()}); desktops = QVector<VirtualDesktop*>({desktops.last()});
} }
if (desktops == m_desktops) { if (desktops == m_desktops) {

5
abstract_client.h
View file

@ -430,6 +430,11 @@ public:
void setDesktop(int); void setDesktop(int);
void enterDesktop(VirtualDesktop *desktop); void enterDesktop(VirtualDesktop *desktop);
void leaveDesktop(VirtualDesktop *desktop); void leaveDesktop(VirtualDesktop *desktop);
/**
* Set the window as being on the attached list of desktops
* On X11 it will be set to the last entry
*/
void setDesktops(QVector<VirtualDesktop *> desktops); void setDesktops(QVector<VirtualDesktop *> desktops);
int desktop() const override { int desktop() const override {