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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kwin
From:       Thomas Lübking <thomas.luebking () web ! de>
Date:       2010-10-17 20:30:33
Message-ID: 20101017203033.A2C5EAC896 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1186892 by luebking:

blast!

 M  +17 -5     tabbox.cpp  


--- trunk/KDE/kdebase/workspace/kwin/tabbox.cpp #1186891:1186892
@@ -181,6 +181,18 @@
     return ret;
     }
 
+void TabBoxHandlerImpl::raiseClient( TabBoxClient* c ) const
+    {
+    Workspace::self()->raiseClient( static_cast<TabBoxClientImpl*>(c)->client() );
+    }
+
+void TabBoxHandlerImpl::restack( TabBoxClient *c, TabBoxClient *under )
+{
+    Workspace::self()->restack( static_cast<TabBoxClientImpl*>(c)->client(),
+                                static_cast<TabBoxClientImpl*>(under)->client() );
+}
+
+
 TabBoxClient* TabBoxHandlerImpl::desktopClient() const
     {
     foreach( const Client* client, Workspace::self()->stackingOrder() )
@@ -480,7 +492,7 @@
 /*!
   Notify effects that the tab box is being hidden.
 */
-void TabBox::hide()
+void TabBox::hide(bool abort)
     {
     delayedShowTimer.stop();
     if( m_isShown )
@@ -493,7 +505,7 @@
     if( isDisplayed())
         kDebug( 1212 ) << "Tab box was not properly closed by an effect";
     m_index = QModelIndex();
-    m_tabBox->hide();
+    m_tabBox->hide( abort );
     QApplication::syncX();
     XEvent otherEvent;
     while (XCheckTypedEvent (display(), EnterNotify, &otherEvent ) )
@@ -1096,7 +1108,7 @@
         if ( ((keyQt & ~Qt::KeyboardModifierMask) == Qt::Key_Escape)
             && !(forward || backward) )
             { // if Escape is part of the shortcut, don't cancel
-            closeTabBox();
+            closeTabBox( true );
             }
         else if( !(forward || backward) )
             {
@@ -1118,10 +1130,10 @@
         tab_box->unrefDisplay();
     }
 
-void Workspace::closeTabBox()
+void Workspace::closeTabBox( bool abort )
     {
     removeTabBoxGrab();
-    tab_box->hide();
+    tab_box->hide( abort );
     modalActionsSwitch( true );
     tab_grab = false;
     control_grab = false;
[prev in list] [next in list] [prev in thread] [next in thread]