Swap if statements around so it makes more sense. Also fix possible
logic error. svn path=/trunk/KDE/kdebase/workspace/; revision=1062369
This commit is contained in:
parent
89e8c3f186
commit
72b50354a0
1 changed files with 12 additions and 12 deletions
24
client.cpp
24
client.cpp
|
@ -1681,18 +1681,7 @@ void Client::setClientShown( bool shown )
|
||||||
{
|
{
|
||||||
if( deleting )
|
if( deleting )
|
||||||
return; // Don't change shown status if this client is being deleted
|
return; // Don't change shown status if this client is being deleted
|
||||||
if( !shown && !hidden )
|
if( shown && hidden )
|
||||||
{
|
|
||||||
unmap( Allowed );
|
|
||||||
hidden = true;
|
|
||||||
//updateVisibility();
|
|
||||||
//updateAllowedActions();
|
|
||||||
if( options->inactiveTabsSkipTaskbar )
|
|
||||||
setSkipTaskbar( true, false ); // TODO: Causes reshuffle of the taskbar
|
|
||||||
workspace()->updateFocusChains( this, Workspace::FocusChainMakeLast );
|
|
||||||
addWorkspaceRepaint( visibleRect() );
|
|
||||||
}
|
|
||||||
else if( hidden )
|
|
||||||
{
|
{
|
||||||
map( Allowed );
|
map( Allowed );
|
||||||
hidden = false;
|
hidden = false;
|
||||||
|
@ -1704,6 +1693,17 @@ void Client::setClientShown( bool shown )
|
||||||
autoRaise();
|
autoRaise();
|
||||||
workspace()->updateFocusChains( this, Workspace::FocusChainMakeFirst );
|
workspace()->updateFocusChains( this, Workspace::FocusChainMakeFirst );
|
||||||
}
|
}
|
||||||
|
if( !shown && !hidden )
|
||||||
|
{
|
||||||
|
unmap( Allowed );
|
||||||
|
hidden = true;
|
||||||
|
//updateVisibility();
|
||||||
|
//updateAllowedActions();
|
||||||
|
if( options->inactiveTabsSkipTaskbar )
|
||||||
|
setSkipTaskbar( true, false ); // TODO: Causes reshuffle of the taskbar
|
||||||
|
workspace()->updateFocusChains( this, Workspace::FocusChainMakeLast );
|
||||||
|
addWorkspaceRepaint( visibleRect() );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Client::getWMHints()
|
void Client::getWMHints()
|
||||||
|
|
Loading…
Reference in a new issue