CT: the real fix. How the heck did this work?

svn path=/trunk/kdebase/kwin/; revision=36903
This commit is contained in:
Cristian Tibirna 1999-12-19 03:04:39 +00:00
parent e3d3ed18d1
commit 05f34e3f95

View file

@ -1073,7 +1073,7 @@ void Workspace::smartPlacement(Client* c){
!(*l)->isIconified() && (*l) != c ) {
xl = (*l)->x(); yt = (*l)->y();
xr = xl + (*l)->height(); yb = yt + (*l)->width();
xr = xl + (*l)->width(); yb = yt + (*l)->height();
//if windows overlap, calc the overall overlapping
if((cxl < xr) && (cxr > xl) &&
@ -1118,21 +1118,21 @@ void Workspace::smartPlacement(Client* c){
!(*l)->isIconified() && (*l) != c ) {
xl = (*l)->x(); yt = (*l)->y();
xr = xl + (*l)->height(); yb = yt + (*l)->width();
xr = xl + (*l)->width(); yb = yt + (*l)->height();
// if not enough room above or under the current tested client
// determine the first non-overlapped x position
if( y < yb && yt < ch + y ) {
if( ( y < yb ) && ( yt < ch + y ) ) {
if( yb > x )
possible = possible < yb ? possible : yb;
if( xr > x )
possible = possible < xr ? possible : xr;
if( xl - cw > x )
possible = possible < xl - cw ? possible : xl - cw;
}
}
x_optimal = x = possible;
}
x = possible;
}
// ... else ==> not enough x dimension (overlap was wrong on horizontal)
@ -1149,7 +1149,7 @@ void Workspace::smartPlacement(Client* c){
(*l) != c && !c->isIconified() ) {
xl = (*l)->x(); yt = (*l)->y();
xr = xl + (*l)->height(); yb = yt + (*l)->width();
xr = xl + (*l)->width(); yb = yt + (*l)->height();
if( yb > y)
possible = possible < yb ? possible : yb;
@ -1157,8 +1157,8 @@ void Workspace::smartPlacement(Client* c){
if( yt - ch > y )
possible = possible < yt - ch ? possible : yt - ch;
}
y_optimal = y = possible;
}
y = possible;
}
}
while( overlap != none && overlap != h_wrong );