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:
parent
6567a35903
commit
147e5c0f8f
|
@ -244,11 +244,7 @@ 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) {
|
||||||
|
@ -259,9 +255,6 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
|
||||||
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) {
|
||||||
|
@ -274,6 +267,7 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
|
||||||
roots_seat_set_focus(seat, view);
|
roots_seat_set_focus(seat, view);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!is_touch) {
|
if (!is_touch) {
|
||||||
wlr_seat_pointer_notify_button(seat->seat, time, button, state);
|
wlr_seat_pointer_notify_button(seat->seat, time, button, state);
|
||||||
|
|
Loading…
Reference in New Issue