Merge pull request #7882 from Sunderland93/master

[Wayland] Fix drag with "Alt" key on non xdg_wm_base shell's
This commit is contained in:
Twinaphex 2019-01-04 02:28:11 +01:00 committed by GitHub
commit 74c8c13102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -327,14 +327,17 @@ static void pointer_handle_button(void *data,
{
wl->input.mouse.left = true;
if (BIT_GET(wl->input.key_state, KEY_LEFTALT) && wl->xdg_toplevel) {
if (wl->xdg_toplevel)
xdg_toplevel_move(wl->xdg_toplevel, wl->seat, serial);
else if (wl->zxdg_toplevel)
zxdg_toplevel_v6_move(wl->zxdg_toplevel, wl->seat, serial);
else if (wl->shell)
wl_shell_surface_move(wl->shell_surf, wl->seat, serial);
if (BIT_GET(wl->input.key_state, KEY_LEFTALT)) {
if (wl->xdg_toplevel) {
xdg_toplevel_move(wl->xdg_toplevel, wl->seat, serial);
}
else if (wl->zxdg_toplevel) {
zxdg_toplevel_v6_move(wl->zxdg_toplevel, wl->seat, serial);
}
else if (wl->shell) {
wl_shell_surface_move(wl->shell_surf, wl->seat, serial);
}
}
}
else if (button == BTN_RIGHT)
wl->input.mouse.right = true;