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

validate screen and max'd state on packing windows

Browse source 
REVIEW: 110054
BUG: 304506
FIXED-IN: 4.11
This commit is contained in:
Thomas Lübking 2013-04-15 20:43:50 +02:00
parent 7eaacfab18
commit d2f9d8feee
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.h
View file

@ -638,6 +638,8 @@ public:
//sets whether the client should be treated as a SessionInteract window
void setSessionInteract(bool needed);
virtual bool isClient() const;
// a helper for the workspace window packing. tests for screen validity and updates since in maximization case as with normal moving
void packTo(int left, int top);
#ifdef KWIN_BUILD_KAPPMENU
// Used by workspace

29
placement.cpp
View file

@ -628,36 +628,47 @@ const char* Placement::policyToString(Policy policy)
// Workspace
// ********************
void Client::packTo(int left, int top)
{
const int oldScreen = screen();
move(left, top);
if (screen() != oldScreen) {
workspace()->sendClientToScreen(this, screen()); // checks rule validity
if (maximizeMode() != MaximizeRestore)
checkWorkspacePosition();
}
}
/*!
Moves active window left until in bumps into another window or workarea edge.
*/
void Workspace::slotWindowPackLeft()
{
if (active_client && active_client->isMovable())
active_client->move(packPositionLeft(active_client, active_client->geometry().left(), true),
active_client->y());
active_client->screen();
active_client->packTo(packPositionLeft(active_client, active_client->geometry().left(), true),
active_client->y());
}
void Workspace::slotWindowPackRight()
{
if (active_client && active_client->isMovable())
active_client->move(
packPositionRight(active_client, active_client->geometry().right(), true)
- active_client->width() + 1, active_client->y());
active_client->packTo(packPositionRight(active_client, active_client->geometry().right(), true)
- active_client->width() + 1, active_client->y());
}
void Workspace::slotWindowPackUp()
{
if (active_client && active_client->isMovable())
active_client->move(active_client->x(),
packPositionUp(active_client, active_client->geometry().top(), true));
active_client->packTo(active_client->x(),
packPositionUp(active_client, active_client->geometry().top(), true));
}
void Workspace::slotWindowPackDown()
{
if (active_client && active_client->isMovable())
active_client->move(active_client->x(),
packPositionDown(active_client, active_client->geometry().bottom(), true) - active_client->height() + 1);
active_client->packTo(active_client->x(),
packPositionDown(active_client, active_client->geometry().bottom(), true) - active_client->height() + 1);
}
void Workspace::slotWindowGrowHorizontal()