[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kwin
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2005-04-12 17:44:05
Message-ID: 20050412174405.D8570633 () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

Fix last commit and remove the old code.


  M +3 -62     manage.cpp   2.74


--- kdebase/kwin/manage.cpp  #2.73:2.74
@@ -426,5 +426,5 @@ bool Client::manage( Window w, bool isMa
         hideClient( true ); // is the active one
 
-    if( !doNotShow )
+    if( isShown( true ) && !doNotShow )
         {
         if( isDialog())
@@ -466,66 +466,7 @@ bool Client::manage( Window w, bool isMa
             }
         }
-    else // doNotShow
-        { // SELI HACK !!!
-        hideClient( true );
-        }
-    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
+    else if( !doNotShow ) // if( !isShown( true ) && !doNotShow )
             {
             updateVisibility();
-            workspace()->raiseClient( this );
-            if( !session && !isMapped )
-                demandAttention();
-            }
-        }
-    else if( !doNotShow ) // !isShown()
-        {
-        rawHide();
-        setMappingState( IconicState );
         }
     else // doNotShow


[prev in list] [next in list] [prev in thread] [next in thread]