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

When doing a forced geometry update while updates are suspended, remember to force the geometry

Browse source 
update when resuming.


svn path=/trunk/KDE/kdebase/workspace/; revision=677635
This commit is contained in:
Luboš Luňák 2007-06-19 15:40:09 +00:00
parent 0de8f314a8
commit ef59c8956a
4 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.cpp
View file

@ -89,7 +89,7 @@ Client::Client( Workspace *ws )
user_time( CurrentTime ), // not known yet
allowed_actions( 0 ),
block_geometry_updates( 0 ),
pending_geometry_update( false ),
pending_geometry_update( PendingGeometryNone ),
shade_geometry_change( false ),
border_left( 0 ),
border_right( 0 ),

3
client.h
View file

@ -461,7 +461,8 @@ class Client
unsigned long allowed_actions;
QSize client_size;
int block_geometry_updates; // >0 - new geometry is remembered, but not actually set
bool pending_geometry_update;
enum PendingGeometry_t { PendingGeometryNone, PendingGeometryNormal, PendingGeometryForced };
PendingGeometry_t pending_geometry_update;
QRect geom_before_block;
bool shade_geometry_change;
int border_left, border_right, border_top, border_bottom;

46
geometry.cpp
View file

@ -1677,16 +1677,21 @@ void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force )
{
client_size = QSize( w - border_left - border_right, h - border_top - border_bottom );
}
if( force == NormalGeometrySet && geom == QRect( x, y, w, h ))
if( force == NormalGeometrySet && geom == QRect( x, y, w, h ) && pending_geometry_update == PendingGeometryNone )
return;
geom = QRect( x, y, w, h );
updateWorkareaDiffs();
if( block_geometry_updates != 0 )
{
pending_geometry_update = true;
if( pending_geometry_update == PendingGeometryForced )
{} // maximum, nothing needed
else if( force == ForceGeometrySet )
pending_geometry_update = PendingGeometryForced;
else
pending_geometry_update = PendingGeometryNormal;
return;
}
if( geom_before_block.size() != geom.size())
bool resized = ( geom_before_block.size() != geom.size() || pending_geometry_update == PendingGeometryForced );
if( resized )
{
resizeDecoration( QSize( w, h ));
XMoveResizeWindow( display(), frameId(), x, y, w, h );
@ -1708,7 +1713,7 @@ void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force )
updateWindowRules();
checkMaximizeGeometry();
workspace()->checkActiveScreen( this );
if( geom_before_block.size() != geom.size())
if( resized )
{
discardWindowPixmap();
if( scene != NULL )
@ -1747,13 +1752,19 @@ void Client::plainResize( int w, int h, ForceGeometry_t force )
kDebug() << "forced size fail:" << QSize( w,h ) << ":" << rules()->checkSize( QSize( w, h )) << endl;
kDebug() << kBacktrace() << endl;
}
// resuming geometry updates is handled only in setGeometry()
assert( pending_geometry_update == PendingGeometryNone || block_geometry_updates > 0 );
if( force == NormalGeometrySet && geom.size() == QSize( w, h ))
return;
geom.setSize( QSize( w, h ));
updateWorkareaDiffs();
if( block_geometry_updates != 0 )
{
pending_geometry_update = true;
if( pending_geometry_update == PendingGeometryForced )
{} // maximum, nothing needed
else if( force == ForceGeometrySet )
pending_geometry_update = PendingGeometryForced;
else
pending_geometry_update = PendingGeometryNormal;
return;
}
resizeDecoration( QSize( w, h ));
@ -1786,16 +1797,23 @@ void Client::plainResize( int w, int h, ForceGeometry_t force )
*/
void Client::move( int x, int y, ForceGeometry_t force )
{
// resuming geometry updates is handled only in setGeometry()
assert( pending_geometry_update == PendingGeometryNone || block_geometry_updates > 0 );
if( force == NormalGeometrySet && geom.topLeft() == QPoint( x, y ))
return;
geom.moveTopLeft( QPoint( x, y ));
updateWorkareaDiffs();
if( block_geometry_updates != 0 )
{
pending_geometry_update = true;
if( pending_geometry_update == PendingGeometryForced )
{} // maximum, nothing needed
else if( force == ForceGeometrySet )
pending_geometry_update = PendingGeometryForced;
else
pending_geometry_update = PendingGeometryNormal;
return;
}
XMoveWindow( display(), frameId(), x, y );
updateWorkareaDiffs();
sendSyntheticConfigureNotify();
updateWindowRules();
checkMaximizeGeometry();
@ -1811,20 +1829,20 @@ void Client::blockGeometryUpdates( bool block )
if( block )
{
if( block_geometry_updates == 0 )
pending_geometry_update = false;
pending_geometry_update = PendingGeometryNone;
++block_geometry_updates;
}
else
{
if( --block_geometry_updates == 0 )
{
if( pending_geometry_update )
if( pending_geometry_update != PendingGeometryNone )
{
if( isShade())
setGeometry( QRect( pos(), adjustedSize()), ForceGeometrySet );
setGeometry( QRect( pos(), adjustedSize()), NormalGeometrySet );
else
setGeometry( geometry(), ForceGeometrySet );
pending_geometry_update = false;
setGeometry( geometry(), NormalGeometrySet );
pending_geometry_update = PendingGeometryNone;
}
}
}

2
manage.cpp
View file

@ -49,7 +49,7 @@ bool Client::manage( Window w, bool isMapped )
// from this place on, manage() mustn't return false
block_geometry_updates = 1;
pending_geometry_update = true; // force update when finishing with geometry changes
pending_geometry_update = PendingGeometryForced; // force update when finishing with geometry changes
embedClient( w, attr );