vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Borrowed code for aspect ratios from elsewhere, this time from FVWM. 

Hopefully this one works better.

svn path=/trunk/kdebase/kwin/; revision=262941
icc-effect-5.14.5
Luboš Luňák 2003-10-29 09:53:32 +00:00
parent 4d095886af
commit ea011dda6a
1 changed files with 59 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
geometry.cpp
View File

@ -605,44 +605,71 @@ QSize Client::sizeForClientSize( const QSize& wsize, bool ignore_height) const
int baseh_inc = xSizeHint.min_height; int baseh_inc = xSizeHint.min_height;
w = int(( w - basew_inc ) / width_inc ) * width_inc + basew_inc; w = int(( w - basew_inc ) / width_inc ) * width_inc + basew_inc;
h = int(( h - baseh_inc ) / height_inc ) * height_inc + baseh_inc; h = int(( h - baseh_inc ) / height_inc ) * height_inc + baseh_inc;
// code for aspect ratios based on code from FVWM, actually it's more or less a copy
// The algorithm for aspect ratios in based on the one used in Metacity, which says: /*
/* This is partially borrowed from GTK (LGPL), which in turn * The math looks like this:
* partially borrowed from fvwm, *
* * minAspectX dwidth maxAspectX
* Copyright 1993, Robert Nation * ---------- <= ------- <= ----------
* You may use this code for any purpose, as long as the original * minAspectY dheight maxAspectY
* copyright remains in the source code and all documentation *
* * If that is multiplied out, then the width and height are
* which in turn borrows parts of the algorithm from uwm * invalid in the following situations:
*/ *
float min_wh = float( xSizeHint.min_aspect.x ) / xSizeHint.min_aspect.y; * minAspectX * dheight > minAspectY * dwidth
float max_wh = float( xSizeHint.max_aspect.x ) / xSizeHint.max_aspect.y; * maxAspectX * dheight < maxAspectY * dwidth
int aspect_w = w - xSizeHint.base_width; *
int aspect_h = h - xSizeHint.base_height; */
if( min_wh > float( aspect_w ) / aspect_h ) if( xSizeHint.flags & PAspect )
{ {
int delta = int(( aspect_h - aspect_w / min_wh ) / height_inc ) * height_inc; double min_aspect_w = xSizeHint.min_aspect.x; // use doubles, because the values can be MAX_INT
if( h - delta >= min_size.height()) double min_aspect_h = xSizeHint.min_aspect.y; // and multiplying would go wrong otherwise
h -= delta; double max_aspect_w = xSizeHint.max_aspect.x;
else double max_aspect_h = xSizeHint.max_aspect.y;
w -= xSizeHint.base_width;
h -= xSizeHint.base_height;
int max_width = max_size.width() - xSizeHint.base_width;
int min_width = min_size.width() - xSizeHint.base_width;
int max_height = max_size.height() - xSizeHint.base_height;
int min_height = min_size.height() - xSizeHint.base_height;
if( min_aspect_w * h > min_aspect_h * w )
{ {
delta = int(( aspect_h * min_wh - aspect_w ) / width_inc ) * width_inc; int delta = int( min_aspect_w * h / min_aspect_h - w ) / width_inc * width_inc;
if( w + delta <= max_size.width()) if( w + delta <= max_width )
w -= delta; w += delta;
} }
} if( min_aspect_w * h > min_aspect_h * w )
if( max_wh < float( aspect_w ) / aspect_h )
{
int delta = int(( aspect_w - aspect_h * max_wh ) / width_inc ) * width_inc;
if( w - delta >= min_size.width())
w -= delta;
else
{ {
delta = int(( aspect_w / max_wh - aspect_h ) / height_inc ) * height_inc; int delta = int( h - w * min_aspect_h / min_aspect_w ) / height_inc * height_inc;
if( h + delta <= max_size.height()) if( h - delta >= min_height )
h -= delta;
else
{
int delta = int( min_aspect_w * h / min_aspect_h - w ) / width_inc * width_inc;
if( w + delta <= max_width )
w += delta;
}
}
if( max_aspect_w * h < max_aspect_h * w )
{
int delta = int( w * max_aspect_h / max_aspect_w - h ) / height_inc * height_inc;
if( h + delta <= max_height )
h += delta; h += delta;
} }
if( max_aspect_w * h < max_aspect_h * w )
{
int delta = int( w - max_aspect_w * h / max_aspect_h ) / width_inc * width_inc;
if( w - delta >= min_width )
w -= delta;
else
{
int delta = int( w * max_aspect_h / max_aspect_w - h ) / height_inc * height_inc;
if( h + delta <= max_height )
h += delta;
}
}
w += xSizeHint.base_width;
h += xSizeHint.base_height;
} }
if ( ignore_height && wsize.height() == 0 ) if ( ignore_height && wsize.height() == 0 )