more autoRaise and focusFollowsMouse fun

svn path=/trunk/kdebase/kwin/; revision=56016
This commit is contained in:
Matthias Ettrich 2000-07-10 21:48:13 +00:00
parent 05a8a4fde3
commit aa3526e42f
2 changed files with 4 additions and 4 deletions

View file

@ -322,7 +322,7 @@ bool WindowWrapper::x11Event( XEvent * e)
{ {
if ( ((Client*)parentWidget())->isActive() if ( ((Client*)parentWidget())->isActive()
&& ( options->focusPolicy != Options::ClickToFocus && options->clickRaise ) ) { && ( options->focusPolicy != Options::ClickToFocus && options->clickRaise ) ) {
((Client*)parentWidget())->workspace()->raiseClient( (Client*) parentWidget() ); ((Client*)parentWidget())->autoRaise();
ungrabButton( winId(), None ); ungrabButton( winId(), None );
} }
@ -1058,7 +1058,9 @@ void Client::mousePressEvent( QMouseEvent * e)
workspace()->lowerClient( this ); workspace()->lowerClient( this );
} }
else if ( e->button() == RightButton ) { else if ( e->button() == RightButton ) {
workspace()->clientPopup( this ) ->popup( e->globalPos() ); if ( isActive() & ( options->focusPolicy != Options::ClickToFocus && options->clickRaise ) )
autoRaise();
workspace()->clientPopup( this )->popup( e->globalPos() );
} }
} }
} }

View file

@ -165,8 +165,6 @@ public slots:
void maximize(); void maximize();
void toggleSticky(); void toggleSticky();
void contextHelp(); void contextHelp();
private slots:
void autoRaise(); void autoRaise();
protected: protected: