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

Got the order backwards, maximizing needs to come before placing

Browse source 
on mainwindow.


svn path=/trunk/KDE/kdebase/kwin/; revision=444056
This commit is contained in:
Luboš Luňák 2005-08-08 14:44:53 +00:00
parent 3fb4801635
commit 7340058987
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
placement.cpp
View file

@ -459,6 +459,8 @@ void Placement::placeOnMainWindow(Client* c, QRect& area, Policy nextPlacement )
{ {
if( nextPlacement == Unknown ) if( nextPlacement == Unknown )
nextPlacement = Centered; nextPlacement = Centered;
if( nextPlacement == Maximizing ) // maximize if needed
placeMaximizing( c, area, NoPlacement );
area = checkArea( c, area ); area = checkArea( c, area );
ClientList mainwindows = c->mainClients(); ClientList mainwindows = c->mainClients();
Client* place_on = NULL; Client* place_on = NULL;
@ -483,7 +485,7 @@ void Placement::placeOnMainWindow(Client* c, QRect& area, Policy nextPlacement )
// made as large as its maximum size and then placed centered. // made as large as its maximum size and then placed centered.
// So the nextPlacement argument allows chaining. In this case, nextPlacement // So the nextPlacement argument allows chaining. In this case, nextPlacement
// is Maximizing and it will call placeCentered(). // is Maximizing and it will call placeCentered().
place( c, area, nextPlacement, Centered ); place( c, area, Centered );
return; return;
} }
} }
@ -492,7 +494,7 @@ void Placement::placeOnMainWindow(Client* c, QRect& area, Policy nextPlacement )
{ // 'mains_count' is used because it doesn't include ignored mainwindows { // 'mains_count' is used because it doesn't include ignored mainwindows
if( mains_count != 1 ) if( mains_count != 1 )
{ {
place( c, area, nextPlacement, Centered ); place( c, area, Centered );
return; return;
} }
place_on = place_on2; // use the only window filtered together with 'mains_count' place_on = place_on2; // use the only window filtered together with 'mains_count'
@ -503,8 +505,6 @@ void Placement::placeOnMainWindow(Client* c, QRect& area, Policy nextPlacement )
// get area again, because the mainwindow may be on different xinerama screen // get area again, because the mainwindow may be on different xinerama screen
area = checkArea( c, QRect()); area = checkArea( c, QRect());
c->keepInArea( area ); // make sure it's kept inside workarea c->keepInArea( area ); // make sure it's kept inside workarea
if( nextPlacement == Maximizing ) // maximize if needed
placeMaximizing( c, area, Unknown );
} }
void Placement::placeMaximizing(Client* c, QRect& area, Policy nextPlacement ) void Placement::placeMaximizing(Client* c, QRect& area, Policy nextPlacement )