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

Obey forced desktop id on electricborder change

Browse source 
BUG: 95627
REVIEW: 103376
This commit is contained in:
Thomas Lübking 2011-12-10 14:43:58 +01:00
parent daf4255f1b
commit 2ff74f83be
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
screenedge.cpp
View file

@ -30,6 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// KWin
#include "atoms.h"
#include "client.h"
#include "effects.h"
#include "options.h"
#include "utils.h"
@ -323,6 +324,9 @@ void ScreenEdge::switchDesktop(ElectricBorder border, const QPoint& _pos)
desk = Workspace::self()->desktopBelow(desk, options->rollOverDesktops);
pos.setY(OFFSET);
}
Client *c = Workspace::self()->getMovingClient();
if (c && c->rules()->checkDesktop(desk) != desk)
return; // user attempts to move a client to another desktop where it is ruleforced to not be
int desk_before = Workspace::self()->currentDesktop();
Workspace::self()->setCurrentDesktop(desk);
if (Workspace::self()->currentDesktop() != desk_before)