CT: fix moving with all mouse buttons for ClickToFocus
svn path=/trunk/kdebase/kwin/; revision=139639
This commit is contained in:
parent
51268a6d18
commit
7d50916939
1 changed files with 3 additions and 4 deletions
|
@ -1433,8 +1433,7 @@ void Client::mousePressEvent( QMouseEvent * e)
|
||||||
if ( !wantsInput() ) // we cannot be active, use it anyway
|
if ( !wantsInput() ) // we cannot be active, use it anyway
|
||||||
active = TRUE;
|
active = TRUE;
|
||||||
|
|
||||||
if (active &&
|
if ((e->button() == LeftButton && options->commandActiveTitlebar1() != Options::MouseOperationsMenu) ||
|
||||||
(e->button() == LeftButton && options->commandActiveTitlebar1() != Options::MouseOperationsMenu) ||
|
|
||||||
(e->button() == MidButton && options->commandActiveTitlebar2() != Options::MouseOperationsMenu) ||
|
(e->button() == MidButton && options->commandActiveTitlebar2() != Options::MouseOperationsMenu) ||
|
||||||
(e->button() == RightButton && options->commandActiveTitlebar3() != Options::MouseOperationsMenu) ) {
|
(e->button() == RightButton && options->commandActiveTitlebar3() != Options::MouseOperationsMenu) ) {
|
||||||
mouseMoveEvent( e );
|
mouseMoveEvent( e );
|
||||||
|
@ -2098,8 +2097,8 @@ bool Client::x11Event( XEvent * e)
|
||||||
autoRaiseTimer = 0;
|
autoRaiseTimer = 0;
|
||||||
delete shadeHoverTimer;
|
delete shadeHoverTimer;
|
||||||
shadeHoverTimer = 0;
|
shadeHoverTimer = 0;
|
||||||
if ( hover_unshade )
|
if ( hover_unshade )
|
||||||
setShade( TRUE, 1 );
|
setShade( TRUE, 1 );
|
||||||
}
|
}
|
||||||
if ( options->focusPolicy == Options::FocusStrictlyUnderMouse )
|
if ( options->focusPolicy == Options::FocusStrictlyUnderMouse )
|
||||||
if ( isActive() && lostMouse )
|
if ( isActive() && lostMouse )
|
||||||
|
|
Loading…
Reference in a new issue