mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Focus inactive container instead of checking cursor position

This commit is contained in:
Ivan Chebykin 2018-05-25 16:41:16 +03:00
parent 3b67253312
commit e19fe56e2f
No known key found for this signature in database
GPG Key ID: 34A8A768BB01746F
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sway/input/cursor.c
View File

@ -162,27 +162,27 @@ 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 {
// Get container-local cursor position
double c_local_y = cursor->cursor->y - c->y;
bool is_below_title =
c_local_y - container_titlebar_height() > 0.001;
// Don't switch focus on title mouseover for // Don't switch focus on title mouseover for
// stacked and tabbed layouts // stacked and tabbed layouts
// If pointed container is in nested containers which are // If pointed container is in nested containers which are
// 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) {
&& !is_below_title) {
do_mouse_focus = false; do_mouse_focus = false;
break; first_tabbed_parent = p;
} }
p = p->parent; p = p->parent;
} }
if(!do_mouse_focus) {
if(do_mouse_focus) { struct sway_container *next_focus = seat_get_focus_inactive(
cursor->seat, first_tabbed_parent);
if(next_focus) {
seat_set_focus_warp(cursor->seat, next_focus, false);
}
} else {
seat_set_focus_warp(cursor->seat, c, false); seat_set_focus_warp(cursor->seat, c, false);
} }
} }