mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-20 06:59:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into mouse-warping-container

Browse source
This commit is contained in:
Ryan Dwyer 2018-10-10 21:50:29 +10:00 • committed by GitHub
commit ed33d95b6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sway/input/cursor.c
View file

@ -877,6 +877,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
while (cont->parent) {
cont = cont->parent;
}
seat_set_focus_container(seat, cont);
seat_begin_move_floating(seat, cont, button);
return;
}

13
sway/input/seat.c
View file

@ -1042,7 +1042,7 @@ void seat_begin_down(struct sway_seat *seat, struct sway_container *con,
seat->op_moved = false;
// In case the container was not raised by gaining focus, raise on click
if (con && !config->raise_floating) {
if (!config->raise_floating) {
container_raise_floating(con);
}
}
@ -1056,6 +1056,12 @@ void seat_begin_move_floating(struct sway_seat *seat,
seat->operation = OP_MOVE_FLOATING;
seat->op_container = con;
seat->op_button = button;
// In case the container was not raised by gaining focus, raise on click
if (!config->raise_floating) {
container_raise_floating(con);
}
cursor_set_image(seat->cursor, "grab", NULL);
}
@ -1089,6 +1095,11 @@ void seat_begin_resize_floating(struct sway_seat *seat,
seat->op_ref_con_ly = con->y;
seat->op_ref_width = con->width;
seat->op_ref_height = con->height;
//
// In case the container was not raised by gaining focus, raise on click
if (!config->raise_floating) {
container_raise_floating(con);
}
const char *image = edge == WLR_EDGE_NONE ?
"se-resize" : wlr_xcursor_get_resize_name(edge);