mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 08:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement correct focusing for tabbed containers

Browse source
This commit is contained in:
Ivan Chebykin 2018-05-25 14:12:09 +03:00
parent c1be4b0153
commit c62efbb5ce
No known key found for this signature in database
GPG key ID: 34A8A768BB01746F
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sway/input/cursor.c
View file

@ -162,10 +162,31 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
seat_set_focus_warp(cursor->seat, c, false); seat_set_focus_warp(cursor->seat, c, false);
} }
} else { } else {
// Don't switch focus on mouseover for stacked and tabbed layouts // Get container-local cursor position
if(focus->parent == c->parent && double c_local_y = cursor->cursor->y - c->y;
(c->parent->layout != L_STACKED bool is_below_title =
|| c->parent->layout != L_TABBED)) { c_local_y - container_titlebar_height() > 0.001;
bool do_mouse_focus = true;
// Don't switch focus on title mouseover for stacked and tabbed
// layouts
if(c->parent && (c->parent->layout == L_STACKED
|| c->parent->layout == L_TABBED)
&& !is_below_title) {
do_mouse_focus = false;
}
// If pointed container is in nested container
// inside tabbed/stacked layout we should skip this nested container
if(c->parent && c->parent->parent &&
(c->parent->parent->layout == L_STACKED
|| c->parent->parent->layout == L_TABBED)
&& !is_below_title) {
do_mouse_focus = false;
}
if(do_mouse_focus) {
seat_set_focus_warp(cursor->seat, c, false); seat_set_focus_warp(cursor->seat, c, false);
} }
} }