mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-02 03:16:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2030 from chebykinn/fix-focus-follows-mouse-tabs

Browse source 
Don't focus tabbed and stacked containers on mouseover
This commit is contained in:
Ryan Dwyer 2018-05-26 23:56:59 +10:00 committed by GitHub
parent 213e740c7f 30c0653b87
commit 1531eb3171
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
sway/input/cursor.c
View file

@ -161,10 +161,40 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
if (output != focus) { if (output != focus) {
seat_set_focus_warp(cursor->seat, c, false); seat_set_focus_warp(cursor->seat, c, false);
} }
} else {
// Don't switch focus on title mouseover for
// stacked and tabbed layouts
// If pointed container is in nested containers which are
// inside tabbed/stacked layout we should skip them
bool do_mouse_focus = true;
if(!sway_assert(c->type == C_VIEW, "pointed container is not a view")) {
return;
}
bool is_visible = view_is_visible(c->sway_view);
struct sway_container *p = c->parent;
while (p) {
if ((p->layout == L_TABBED || p->layout == L_STACKED)
&& !is_visible) {
do_mouse_focus = false;
break;
}
p = p->parent;
}
if (!do_mouse_focus) {
struct sway_container *next_focus = seat_get_focus_inactive(
cursor->seat, p);
if(next_focus && !sway_assert(next_focus->type == C_VIEW,
"focus inactive container is not a view")) {
return;
}
if (next_focus && view_is_visible(next_focus->sway_view)) {
seat_set_focus_warp(cursor->seat, next_focus, false);
}
} else { } else {
seat_set_focus_warp(cursor->seat, c, false); seat_set_focus_warp(cursor->seat, c, false);
} }
} }
}
// reset cursor if switching between clients // reset cursor if switching between clients
struct wl_client *client = NULL; struct wl_client *client = NULL;