Commit 724895e5 authored by Thomas Lübking's avatar Thomas Lübking
Browse files

handle ungrab crossings for FFM & mouse preference

BUG: 142040
REVIEW: 104316
parent 7020f31d
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment