Break after first tabbed/stacked layout

This commit is contained in:
Ivan Chebykin 2018-05-25 17:45:41 +03:00
parent 53516fa03f
commit 740234a4bc
No known key found for this signature in database
GPG Key ID: 34A8A768BB01746F
1 changed files with 3 additions and 4 deletions

View File

@ -168,19 +168,18 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
// inside tabbed/stacked layout we should skip them // inside tabbed/stacked layout we should skip them
bool do_mouse_focus = true; bool do_mouse_focus = true;
struct sway_container *p = c->parent; struct sway_container *p = c->parent;
struct sway_container *first_tabbed_parent = c->parent;
while (p) { while (p) {
if ((p->layout == L_TABBED || p->layout == L_STACKED) if ((p->layout == L_TABBED || p->layout == L_STACKED)
&& !view_is_visible(c->sway_view)) { && !view_is_visible(c->sway_view)) {
do_mouse_focus = false; do_mouse_focus = false;
first_tabbed_parent = p; break;
} }
p = p->parent; p = p->parent;
} }
if (!do_mouse_focus) { if (!do_mouse_focus) {
struct sway_container *next_focus = seat_get_focus_inactive( struct sway_container *next_focus = seat_get_focus_inactive(
cursor->seat, first_tabbed_parent); cursor->seat, p);
if (next_focus) { if (next_focus && view_is_visible(next_focus->sway_view)) {
seat_set_focus_warp(cursor->seat, next_focus, false); seat_set_focus_warp(cursor->seat, next_focus, false);
} }
} else { } else {