svn path=/trunk/kdebase/kwin/; revision=175815
This commit is contained in:
Luboš Luňák 2002-09-05 07:57:53 +00:00
parent df05c96459
commit 3d3c5fa658
2 changed files with 6 additions and 3 deletions

View file

@ -2635,8 +2635,7 @@ bool Client::performMouseCommand( Options::MouseCommand command, QPoint globalPo
case Options::MouseOperationsMenu: case Options::MouseOperationsMenu:
if ( isActive() & ( options->focusPolicy != Options::ClickToFocus && options->clickRaise ) ) if ( isActive() & ( options->focusPolicy != Options::ClickToFocus && options->clickRaise ) )
autoRaise(); autoRaise();
workspace()->clientPopup( this )->exec( globalPos ); workspace()->showWindowMenu( globalPos, this );
workspace()->requestFocus( this );
break; break;
case Options::MouseToggleRaiseAndLower: case Options::MouseToggleRaiseAndLower:
if ( workspace()->topClientOnDesktop() == this ) if ( workspace()->topClientOnDesktop() == this )

View file

@ -1670,8 +1670,12 @@ void Workspace::clientHidden( Client* c )
// KDE4 - remove the unused argument // KDE4 - remove the unused argument
QPopupMenu* Workspace::clientPopup( Client* ) QPopupMenu* Workspace::clientPopup( Client* cl )
{ {
if( cl != active_client ) {
kdWarning( 1212 ) << "Using Workspace::clientPopup() with an argument is deprecated" << endl;
activateClient( cl );
}
return clientPopup(); return clientPopup();
} }