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

More shade related changes.

Browse source 
svn path=/trunk/kdebase/kwin/; revision=257727
This commit is contained in:
Luboš Luňák 2003-10-10 13:00:26 +00:00
parent d45a853dd4
commit 984c76f0c1
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activation.cpp
View file

@ -712,7 +712,7 @@ void Client::setActive( bool act)
autoRaiseTimer = 0;
}
if( shade_mode == ShadeActivated )
if( !active && shade_mode == ShadeActivated )
setShade( ShadeNormal );
StackingUpdatesBlocker blocker( workspace());

28
events.cpp
View file

@ -587,19 +587,19 @@ void Client::mapRequestEvent( XMapRequestEvent* e )
// also copied in clientMessage()
if( isMinimized())
unminimize();
else if( isShade())
if( isShade())
setShade( ShadeNone );
else // it's on another virtual desktop
{
if( workspace()->allowClientActivation( this ))
workspace()->activateClient( this );
else
demandAttention();
}
break;
case NormalState:
// TODO fake MapNotify?
break;
if( !isOnCurrentDesktop())
{
if( workspace()->allowClientActivation( this ))
workspace()->activateClient( this );
else
demandAttention();
}
break;
case NormalState:
// TODO fake MapNotify?
break;
}
}
@ -668,9 +668,9 @@ void Client::clientMessageEvent( XClientMessageEvent* e )
{ // copied from mapRequest()
if( isMinimized())
unminimize();
else if( isShade())
if( isShade())
setShade( ShadeNone );
else // it's on another virtual desktop
if( !isOnCurrentDesktop())
{
if( workspace()->allowClientActivation( this ))
workspace()->activateClient( this );

2
geometry.cpp
View file

@ -1456,7 +1456,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
}
// ShadeHover or ShadeActive, ShadeNormal was already avoided above
if ( mode != Center && shade_mode != ShadeNone )
if ( mode != Center && shade_mode != ShadeNone ) // SHADE
setShade( ShadeNone );
QPoint globalPos( x_root, y_root );