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

handle ungrab crossings for FFM & mouse preference

Browse source 
BUG: 142040
REVIEW: 104316
This commit is contained in:
Thomas Lübking 2012-03-17 15:34:32 +01:00
parent 1cedbe6c23
commit e99dc3ab5b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
events.cpp
View file

@ -864,9 +864,10 @@ void Client::enterNotifyEvent(XCrossingEvent* e)
{
if (e->window != frameId())
return; // care only about entering the whole frame
if (e->mode == NotifyNormal ||
(!options->focusPolicyIsReasonable() &&
e->mode == NotifyUngrab)) {
#define MOUSE_DRIVEN_FOCUS (!options->focusPolicyIsReasonable() || \
(options->focusPolicy() == Options::FocusFollowsMouse && options->isNextFocusPrefersMouse()))
if (e->mode == NotifyNormal || (e->mode == NotifyUngrab && MOUSE_DRIVEN_FOCUS)) {
if (options->isShadeHover()) {
cancelShadeHoverTimer();
@ -877,6 +878,7 @@ void Client::enterNotifyEvent(XCrossingEvent* e)
shadeHoverTimer->start(options->shadeHoverInterval());
}
}
#undef MOUSE_DRIVEN_FOCUS
if (options->focusPolicy() == Options::ClickToFocus)
return;