blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor roots_cursor_press_button 

Removed the button_count check when resizing/moving/rotating ends,
since all buttons presses are now properly tracked.
This commit is contained in:
Vincent Vanlaer 2018-02-06 13:15:27 +01:00
parent 6567a35903
commit 147e5c0f8f
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
rootston/cursor.c
View File

@ -244,35 +244,29 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
roots_seat_begin_rotate(seat, view); roots_seat_begin_rotate(seat, view);
break; break;
} }
if (!is_touch) { } else {
wlr_seat_pointer_notify_button(seat->seat, time, button, state);
}
return;
}
if (view && !surface) { if (view && !surface) {
if (cursor->pointer_view) { if (cursor->pointer_view) {
seat_view_deco_button(cursor->pointer_view, sx, sy, button, state); seat_view_deco_button(cursor->pointer_view, sx, sy, button, state);
}
} }
}
if (state == WLR_BUTTON_RELEASED && if (state == WLR_BUTTON_RELEASED &&
cursor->mode != ROOTS_CURSOR_PASSTHROUGH) { cursor->mode != ROOTS_CURSOR_PASSTHROUGH) {
cursor->mode = ROOTS_CURSOR_PASSTHROUGH; cursor->mode = ROOTS_CURSOR_PASSTHROUGH;
if (seat->seat->pointer_state.button_count == 0) {
return;
} }
}
switch (state) { switch (state) {
case WLR_BUTTON_RELEASED: case WLR_BUTTON_RELEASED:
if (!is_touch) { if (!is_touch) {
roots_cursor_update_position(cursor, time); roots_cursor_update_position(cursor, time);
}
break;
case WLR_BUTTON_PRESSED:
roots_seat_set_focus(seat, view);
break;
} }
break;
case WLR_BUTTON_PRESSED:
roots_seat_set_focus(seat, view);
break;
} }
if (!is_touch) { if (!is_touch) {