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

Some attempts to fix aspect ratios breaking resizing. 

When resizing windows manually (Client::handleMoveResize()) still doesn't work.

svn path=/trunk/kdebase/kwin/; revision=269296
icc-effect-5.14.5
Luboš Luňák 2003-11-24 14:26:11 +00:00
parent 0654c0d3b7
commit 2c3f9c4069
4 changed files with 107 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client.cpp
View File

@ -256,7 +256,7 @@ void Client::updateDecoration( bool check_workspace_pos, bool force )
if( !isShade())
plainResize( sizeForClientSize( clientSize()), ForceGeometrySet );
else
plainResize( sizeForClientSize( QSize( clientSize().width(), 0 ), true ), ForceGeometrySet );
plainResize( sizeForClientSize( QSize( clientSize().width(), 0 ), SizemodeShaded ), ForceGeometrySet );
workarea_diff_x = save_workarea_diff_x;
workarea_diff_y = save_workarea_diff_y;
do_show = true;
@ -698,7 +698,7 @@ void Client::setShade( ShadeMode mode )
{ // shade_mode == ShadeNormal
int h = height();
shade_geometry_change = true;
QSize s( sizeForClientSize( QSize( clientSize().width(), 0), TRUE ) );
QSize s( sizeForClientSize( QSize( clientSize().width(), 0), SizemodeShaded ) );
XSelectInput( qt_xdisplay(), wrapper, ClientWinMask ); // avoid getting UnmapNotify
XUnmapWindow( qt_xdisplay(), client );
XUnmapWindow( qt_xdisplay(), wrapper );
@ -725,7 +725,7 @@ void Client::setShade( ShadeMode mode )
{
int h = height();
shade_geometry_change = true;
QSize s( sizeForClientSize( clientSize(), TRUE ) );
QSize s( sizeForClientSize( clientSize(), SizemodeShaded ));
// FRAME bool wasStaticContents = testWFlags( WStaticContents );
// setWFlags( WStaticContents );
int step = QMAX( 4, QABS( h - s.height() ) / as )+1;

12
client.h
View File

@ -84,7 +84,15 @@ class Client : public QObject, public KDecorationDefines
void releaseWindow( bool on_shutdown = false );
QSize adjustedSize( const QSize& ) const;
enum Sizemode // how to resize the window in order to obey constains (mainly aspect ratios)
{
SizemodeAny,
SizemodeFixedW, // try not to affect width
SizemodeFixedH, // try not to affect height
SizemodeMax, // try not to make it larger in either direction
SizemodeShaded // shaded - height == 0
};
QSize adjustedSize( const QSize&, Sizemode mode = SizemodeAny ) const;
QPixmap icon() const;
QPixmap miniIcon() const;
@ -316,7 +324,7 @@ class Client : public QObject, public KDecorationDefines
bool isNormalState() const;
bool isManaged() const; // returns false if this client is not yet managed
void updateAllowedActions( bool force = false );
QSize sizeForClientSize( const QSize&, bool ignore_height = FALSE ) const;
QSize sizeForClientSize( const QSize&, Sizemode mode = SizemodeAny ) const;
void changeMaximize( bool horizontal, bool vertical, bool adjust );
void getWmNormalHints();
void getIcons();

129
geometry.cpp
View File

@ -588,14 +588,14 @@ void Client::checkDirection( int new_diff, int old_diff, QRect& rect, const QRec
/*!
Adjust the frame size \a frame according to he window's size hints.
*/
QSize Client::adjustedSize( const QSize& frame) const
QSize Client::adjustedSize( const QSize& frame, Sizemode mode ) const
{
// first, get the window size for the given frame size s
QSize wsize( frame.width() - ( border_left + border_right ),
frame.height() - ( border_top + border_bottom ));
return sizeForClientSize( wsize );
return sizeForClientSize( wsize, mode );
}
/*!
@ -606,7 +606,7 @@ QSize Client::adjustedSize( const QSize& frame) const
maximum and incremental size changes).
*/
QSize Client::sizeForClientSize( const QSize& wsize, bool ignore_height) const
QSize Client::sizeForClientSize( const QSize& wsize, Sizemode mode ) const
{
int w = wsize.width();
int h = wsize.height();
@ -641,7 +641,7 @@ QSize Client::sizeForClientSize( const QSize& wsize, bool ignore_height) const
int baseh_inc = xSizeHint.min_height;
w = int(( w - basew_inc ) / width_inc ) * width_inc + basew_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
// code for aspect ratios based on code from FVWM
/*
* The math looks like this:
*
@ -668,47 +668,94 @@ QSize Client::sizeForClientSize( const QSize& wsize, bool ignore_height) const
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 )
{
int delta = int( min_aspect_w * h / min_aspect_h - w ) / width_inc * width_inc;
if( w + delta <= max_width )
w += delta;
#define ASPECT_CHECK_GROW_W \
if( min_aspect_w * h > min_aspect_h * w ) \
{ \
int delta = int( min_aspect_w * h / min_aspect_h - w ) / width_inc * width_inc; \
if( w + delta <= max_width ) \
w += delta; \
}
if( min_aspect_w * h > min_aspect_h * w )
#define ASPECT_CHECK_SHRINK_H_GROW_W \
if( min_aspect_w * h > min_aspect_h * w ) \
{ \
int delta = int( h - w * min_aspect_h / min_aspect_w ) / height_inc * height_inc; \
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; \
} \
}
#define ASPECT_CHECK_GROW_H \
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; \
}
#define ASPECT_CHECK_SHRINK_W_GROW_H \
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; \
} \
}
switch( mode )
{
int delta = int( h - w * min_aspect_h / min_aspect_w ) / height_inc * height_inc;
if( h - delta >= min_height )
h -= delta;
else
case SizemodeAny:
{
int delta = int( min_aspect_w * h / min_aspect_h - w ) / width_inc * width_inc;
if( w + delta <= max_width )
w += delta;
ASPECT_CHECK_SHRINK_H_GROW_W
ASPECT_CHECK_SHRINK_W_GROW_H
ASPECT_CHECK_GROW_H
ASPECT_CHECK_GROW_W
break;
}
}
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;
}
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
case SizemodeFixedW:
{
int delta = int( w * max_aspect_h / max_aspect_w - h ) / height_inc * height_inc;
if( h + delta <= max_height )
h += delta;
// the checks are order so that attempts to modify height are first
ASPECT_CHECK_GROW_H
ASPECT_CHECK_SHRINK_H_GROW_W
ASPECT_CHECK_SHRINK_W_GROW_H
ASPECT_CHECK_GROW_W
break;
}
case SizemodeFixedH:
{
ASPECT_CHECK_GROW_W
ASPECT_CHECK_SHRINK_W_GROW_H
ASPECT_CHECK_SHRINK_H_GROW_W
ASPECT_CHECK_GROW_H
break;
}
case SizemodeMax:
{
// first checks that try to shrink
ASPECT_CHECK_SHRINK_H_GROW_W
ASPECT_CHECK_SHRINK_W_GROW_H
ASPECT_CHECK_GROW_W
ASPECT_CHECK_GROW_H
break;
}
case SizemodeShaded:
break;
}
#undef ASPECT_CHECK_SHRINK_H_GROW_W
#undef ASPECT_CHECK_SHRINK_W_GROW_H
#undef ASPECT_CHECK_GROW_W
#undef ASPECT_CHECK_GROW_H
w += xSizeHint.base_width;
h += xSizeHint.base_height;
}
if ( ignore_height && wsize.height() == 0 )
if ( mode == SizemodeShaded && wsize.height() == 0 )
h = 0;
return QSize( w + border_left + border_right, h + border_top + border_bottom );
}
@ -1226,16 +1273,16 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
{
if( geom_restore.width() == 0 )
{ // needs placement
plainResize( adjustedSize(QSize(width(), clientArea.height())));
plainResize( adjustedSize(QSize(width(), clientArea.height()), SizemodeFixedH ));
workspace()->placeSmart( this );
}
else
setGeometry( QRect(QPoint( geom_restore.x(), clientArea.top()),
adjustedSize(QSize( geom_restore.width(), clientArea.height()))));
adjustedSize(QSize( geom_restore.width(), clientArea.height()), SizemodeFixedH )));
}
else
setGeometry( QRect(QPoint(x(), clientArea.top()),
adjustedSize(QSize(width(), clientArea.height()))));
adjustedSize(QSize(width(), clientArea.height()), SizemodeFixedH )));
info->setState( NET::MaxVert, NET::Max );
break;
}
@ -1246,16 +1293,16 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
{
if( geom_restore.height() == 0 )
{ // needs placement
plainResize( adjustedSize(QSize(clientArea.width(), height())));
plainResize( adjustedSize(QSize(clientArea.width(), height()), SizemodeFixedW ));
workspace()->placeSmart( this );
}
else
setGeometry( QRect( QPoint(clientArea.left(), geom_restore.y()),
adjustedSize(QSize(clientArea.width(), geom_restore.height()))));
adjustedSize(QSize(clientArea.width(), geom_restore.height()), SizemodeFixedW )));
}
else
setGeometry( QRect( QPoint(clientArea.left(), y()),
adjustedSize(QSize(clientArea.width(), height()))));
adjustedSize(QSize(clientArea.width(), height()), SizemodeFixedW )));
info->setState( NET::MaxHoriz, NET::Max );
break;
}
@ -1296,7 +1343,7 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
case MaximizeFull:
{
QSize adjSize = adjustedSize(clientArea.size());
QSize adjSize = adjustedSize(clientArea.size(), SizemodeMax );
QRect r = QRect(clientArea.topLeft(), adjSize);
setGeometry( r );
info->setState( NET::Max, NET::Max );

12
placement.cpp
View File

@ -499,7 +499,7 @@ void Client::growHorizontal()
{
QRect geom = geometry();
geom.setRight( workspace()->packPositionRight( this, geom.right(), true ));
QSize adjsize = adjustedSize( geom.size());
QSize adjsize = adjustedSize( geom.size(), SizemodeFixedW );
if( geometry().size() == adjsize && geom.size() != adjsize && xSizeHint.width_inc > 1 ) // take care of size increments
{
int newright = workspace()->packPositionRight( this, geom.right() + xSizeHint.width_inc - 1, true );
@ -509,7 +509,7 @@ void Client::growHorizontal()
QPoint(( x() + newright ) / 2, geometry().center().y()), desktop()).right() >= newright )
geom.setRight( newright );
}
geom.setSize( adjustedSize( geom.size()));
geom.setSize( adjustedSize( geom.size(), SizemodeFixedW ));
setGeometry( geom );
}
@ -525,7 +525,7 @@ void Client::shrinkHorizontal()
geom.setRight( workspace()->packPositionLeft( this, geom.right(), false ));
if( geom.width() <= 1 )
return;
geom.setSize( adjustedSize( geom.size()));
geom.setSize( adjustedSize( geom.size(), SizemodeFixedW ));
if( geom.width() > 20 )
setGeometry( geom );
}
@ -540,7 +540,7 @@ void Client::growVertical()
{
QRect geom = geometry();
geom.setBottom( workspace()->packPositionDown( this, geom.bottom(), true ));
QSize adjsize = adjustedSize( geom.size());
QSize adjsize = adjustedSize( geom.size(), SizemodeFixedH );
if( geometry().size() == adjsize && geom.size() != adjsize && xSizeHint.height_inc > 1 ) // take care of size increments
{
int newbottom = workspace()->packPositionDown( this, geom.bottom() + xSizeHint.height_inc - 1, true );
@ -549,7 +549,7 @@ void Client::growVertical()
QPoint( geometry().center().x(), ( y() + newbottom ) / 2 ), desktop()).bottom() >= newbottom )
geom.setBottom( newbottom );
}
geom.setSize( adjustedSize( geom.size()));
geom.setSize( adjustedSize( geom.size(), SizemodeFixedH ));
setGeometry( geom );
}
@ -566,7 +566,7 @@ void Client::shrinkVertical()
geom.setBottom( workspace()->packPositionUp( this, geom.bottom(), false ));
if( geom.height() <= 1 )
return;
geom.setSize( adjustedSize( geom.size()));
geom.setSize( adjustedSize( geom.size(), SizemodeFixedH ));
if( geom.height() > 20 )
setGeometry( geom );
}