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

Fix last commit and remove the old code.

Browse source 
svn path=/trunk/kdebase/kwin/; revision=405106
This commit is contained in:
Luboš Luňák 2005-04-12 17:44:05 +00:00
parent e1fb4aa2b6
commit 98aaf1ee02
1 changed files with 3 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
manage.cpp
View file

@ -425,7 +425,7 @@ bool Client::manage( Window w, bool isMapped )
if( isTopMenu()) // they're shown in Workspace::addClient() if their mainwindow
hideClient( true ); // is the active one
if( !doNotShow )
if( isShown( true ) && !doNotShow )
{
if( isDialog())
Notify::raise( Notify::TransNew );
@ -465,68 +465,9 @@ bool Client::manage( Window w, bool isMapped )
}
}
}
else // doNotShow
{ // SELI HACK !!!
hideClient( true );
}
if ( isShown( true ) && !doNotShow )
else if( !doNotShow ) // if( !isShown( true ) && !doNotShow )
{
if( isDialog())
Notify::raise( Notify::TransNew );
if( isNormalWindow())
Notify::raise( Notify::New );
bool allow;
if( session )
allow = session->active && !workspace()->wasUserInteraction();
else
allow = workspace()->allowClientActivation( this, userTime(), false );
// if session saving, force showing new windows (i.e. "save file?" dialogs etc.)
// also force if activation is allowed
if( !isOnCurrentDesktop() && !isMapped && !session && ( allow || workspace()->sessionSaving()))
workspace()->setCurrentDesktop( desktop());
if( isOnCurrentDesktop())
{
setMappingState( NormalState );
if( isMapped )
{
workspace()->raiseClient( this );
rawShow();
}
else
{
if( allow )
{
workspace()->raiseClient( this );
rawShow();
if( !isSpecialWindow() || isOverride())
if ( options->focusPolicyIsReasonable() && wantsTabFocus() )
workspace()->requestFocus( this );
}
else
{
workspace()->restackClientUnderActive( this );
rawShow();
if( !session && ( !isSpecialWindow() || isOverride()))
demandAttention();
}
}
}
else
{
updateVisibility();
workspace()->raiseClient( this );
if( !session && !isMapped )
demandAttention();
}
}
else if( !doNotShow ) // !isShown()
{
rawHide();
setMappingState( IconicState );
updateVisibility();
}
else // doNotShow
{ // SELI HACK !!!