yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not autoraise a window unless the mouse has been moved.

Browse source 
Fixes unintended autoraises when switching workspaces.

BUG: 306281
FIXED-IN: 4.9.2
This commit is contained in:
Michael Hohmuth 2012-09-04 23:36:39 +02:00 committed by Thomas Lübking
parent 42ad299d88
commit 371a29096b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
events.cpp
View file

@ -882,8 +882,10 @@ void Client::enterNotifyEvent(XCrossingEvent* e)
if (options->focusPolicy() == Options::ClickToFocus || workspace()->windowMenuShown()) if (options->focusPolicy() == Options::ClickToFocus || workspace()->windowMenuShown())
return; return;
QPoint currentPos(e->x_root, e->y_root);
if (options->isAutoRaise() && !isDesktop() && if (options->isAutoRaise() && !isDesktop() &&
!isDock() && workspace()->focusChangeEnabled() && !isDock() && workspace()->focusChangeEnabled() &&
currentPos != workspace()->focusMousePosition() &&
workspace()->topClientOnDesktop(workspace()->currentDesktop(), workspace()->topClientOnDesktop(workspace()->currentDesktop(),
options->isSeparateScreenFocus() ? screen() : -1) != this) { options->isSeparateScreenFocus() ? screen() : -1) != this) {
delete autoRaiseTimer; delete autoRaiseTimer;
@ -893,7 +895,6 @@ void Client::enterNotifyEvent(XCrossingEvent* e)
autoRaiseTimer->start(options->autoRaiseInterval()); autoRaiseTimer->start(options->autoRaiseInterval());
} }
QPoint currentPos(e->x_root, e->y_root);
if (isDesktop() || isDock()) if (isDesktop() || isDock())
return; return;
// for FocusFollowsMouse, change focus only if the mouse has actually been moved, not if the focus // for FocusFollowsMouse, change focus only if the mouse has actually been moved, not if the focus