CT: we _really_ don't want to show an operations menu if the active
client is the desktopWidget. Checked by Lubos Lunak svn path=/trunk/kdebase/kwin/; revision=140684icc-effect-5.14.5
parent
3038d6f96b
commit
c125fb612d
|
@ -436,8 +436,8 @@ void Workspace::init()
|
|||
Client* c = clientFactory( wins[i] );
|
||||
addClient( c );
|
||||
c->manage( TRUE );
|
||||
if ( !c->wantsTabFocus() )
|
||||
focus_chain.remove( c );
|
||||
if ( !c->wantsTabFocus() )
|
||||
focus_chain.remove( c );
|
||||
if ( root != qt_xrootwin() ) {
|
||||
// TODO may use QWidget:.create
|
||||
XReparentWindow( qt_xdisplay(), c->winId(), root, 0, 0 );
|
||||
|
@ -597,9 +597,9 @@ bool Workspace::workspaceEvent( XEvent * e )
|
|||
}
|
||||
if ( c ) {
|
||||
bool b = c->windowEvent( e );
|
||||
if ( !c->wantsTabFocus() )
|
||||
focus_chain.remove( c );
|
||||
return b;
|
||||
if ( !c->wantsTabFocus() )
|
||||
focus_chain.remove( c );
|
||||
return b;
|
||||
}
|
||||
break;
|
||||
case EnterNotify:
|
||||
|
@ -3184,7 +3184,7 @@ void Workspace::sendToDesktop( int desk )
|
|||
*/
|
||||
void Workspace::slotWindowOperations()
|
||||
{
|
||||
if ( !active_client )
|
||||
if ( !active_client || desktopWidget())
|
||||
return;
|
||||
QPopupMenu* p = clientPopup( active_client );
|
||||
Client* c = active_client;
|
||||
|
|
Loading…
Reference in New Issue