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

I guess my last commit actually broke the placement.

Browse source 
svn path=/trunk/kdebase/kwin/; revision=123264
This commit is contained in:
Luboš Luňák 2001-11-19 22:34:20 +00:00
parent e5b822cc9b
commit eb3d34ed2b
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
workspace.cpp
View file

@ -1708,6 +1708,7 @@ void Workspace::smartPlacement(Client* c){
long int overlap, min_overlap = 0; long int overlap, min_overlap = 0;
int x_optimal, y_optimal; int x_optimal, y_optimal;
int possible; int possible;
int desktop = c->desktop() < 0 || c->isSticky() ? currentDesktop() : c->desktop();
int cxl, cxr, cyt, cyb; //temp coords int cxl, cxr, cyt, cyb; //temp coords
int xl, xr, yt, yb; //temp coords int xl, xr, yt, yb; //temp coords
@ -1738,7 +1739,7 @@ void Workspace::smartPlacement(Client* c){
cyt = y; cyb = y + ch; cyt = y; cyb = y + ch;
QValueList<Client*>::ConstIterator l; QValueList<Client*>::ConstIterator l;
for(l = clients.begin(); l != clients.end() ; ++l ) { for(l = clients.begin(); l != clients.end() ; ++l ) {
if((*l)->isOnDesktop(c->desktop()) && (*l) != desktop_client && if((*l)->isOnDesktop(desktop) && (*l) != desktop_client &&
!(*l)->isIconified() && (*l) != c ) { !(*l)->isIconified() && (*l) != c ) {
xl = (*l)->x(); yt = (*l)->y(); xl = (*l)->x(); yt = (*l)->y();
@ -1786,7 +1787,7 @@ void Workspace::smartPlacement(Client* c){
QValueList<Client*>::ConstIterator l; QValueList<Client*>::ConstIterator l;
for(l = clients.begin(); l != clients.end() ; ++l) { for(l = clients.begin(); l != clients.end() ; ++l) {
if ( (*l)->isOnDesktop(c->desktop()) && (*l) != desktop_client && if ( (*l)->isOnDesktop(desktop) && (*l) != desktop_client &&
!(*l)->isIconified() && (*l) != c ) { !(*l)->isIconified() && (*l) != c ) {
xl = (*l)->x(); yt = (*l)->y(); xl = (*l)->x(); yt = (*l)->y();
@ -1816,7 +1817,7 @@ void Workspace::smartPlacement(Client* c){
//test the position of each window on the desk //test the position of each window on the desk
QValueList<Client*>::ConstIterator l; QValueList<Client*>::ConstIterator l;
for( l = clients.begin(); l != clients.end() ; ++l ) { for( l = clients.begin(); l != clients.end() ; ++l ) {
if( (*l)->isOnDesktop(c->desktop() ) && (*l) != desktop_client && if( (*l)->isOnDesktop(desktop) && (*l) != desktop_client &&
(*l) != c && !c->isIconified() ) { (*l) != c && !c->isIconified() ) {
xl = (*l)->x(); yt = (*l)->y(); xl = (*l)->x(); yt = (*l)->y();
@ -1856,7 +1857,7 @@ void Workspace::cascadePlacement (Client* c, bool re_init) {
int delta_x = 24; int delta_x = 24;
int delta_y = 24; int delta_y = 24;
int d = c->desktop() < 0 ? ( currentDesktop() - 1 ) : ( c->desktop() - 1 ); int d = c->desktop() < 0 || c->isSticky() ? ( currentDesktop() - 1 ) : ( c->desktop() - 1 );
// get the maximum allowed windows space and desk's origin // get the maximum allowed windows space and desk's origin
// (CT 20Nov1999 - is this common to all desktops?) // (CT 20Nov1999 - is this common to all desktops?)