From 4c6bd603da7d5f8f4d4a794652b6357278943cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Sun, 17 Oct 2010 20:30:33 +0000 Subject: [PATCH] blast! svn path=/trunk/KDE/kdebase/workspace/; revision=1186892 --- tabbox.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/tabbox.cpp b/tabbox.cpp index 98aa182d3e..e2e081884e 100644 --- a/tabbox.cpp +++ b/tabbox.cpp @@ -180,6 +180,18 @@ TabBoxClientList TabBoxHandlerImpl::stackingOrder() const } return ret; } + +void TabBoxHandlerImpl::raiseClient( TabBoxClient* c ) const + { + Workspace::self()->raiseClient( static_cast(c)->client() ); + } + +void TabBoxHandlerImpl::restack( TabBoxClient *c, TabBoxClient *under ) +{ + Workspace::self()->restack( static_cast(c)->client(), + static_cast(under)->client() ); +} + TabBoxClient* TabBoxHandlerImpl::desktopClient() const { @@ -480,7 +492,7 @@ void TabBox::show() /*! 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 @@ void TabBox::hide() 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 @@ void Workspace::tabBoxKeyPress( int keyQt ) 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 @@ void Workspace::unrefTabBox() 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;