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

FSUM: honor delay on leave events as well

Browse source 
This makes working around bug #63279 impossible :-(

BUG: 285960
CCBUG: 63279
REVIEW: 103130
This commit is contained in:
Thomas Lübking 2011-11-13 18:23:49 +01:00
parent 26c0f269f1
commit 55c52977b3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
events.cpp
View file

@ -895,7 +895,7 @@ void Client::enterNotifyEvent(XCrossingEvent* e)
} }
QPoint currentPos(e->x_root, e->y_root); QPoint currentPos(e->x_root, e->y_root);
if (options->focusPolicy != Options::FocusStrictlyUnderMouse && (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
// change came because of window changes (e.g. closing a window) - #92290 // change came because of window changes (e.g. closing a window) - #92290
@ -943,9 +943,9 @@ void Client::leaveNotifyEvent(XCrossingEvent* e)
shadeHoverTimer->start(options->shadeHoverInterval); shadeHoverTimer->start(options->shadeHoverInterval);
} }
} }
if (options->focusPolicy == Options::FocusStrictlyUnderMouse) if (options->focusPolicy == Options::FocusStrictlyUnderMouse && isActive() && lostMouse) {
if (isActive() && lostMouse) workspace()->requestDelayFocus(0);
workspace()->requestFocus(0) ; }
return; return;
} }
} }