mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 17:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 41991542ca 155e863ead
commit ed33d95b6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 9 deletions
Show stats 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) { while (cont->parent) {
cont = cont->parent; cont = cont->parent;
} }
seat_set_focus_container(seat, cont);
seat_begin_move_floating(seat, cont, button); seat_begin_move_floating(seat, cont, button);
return; 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; seat->op_moved = false;
// In case the container was not raised by gaining focus, raise on click // 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); container_raise_floating(con);
} }
} }
@ -1056,6 +1056,12 @@ void seat_begin_move_floating(struct sway_seat *seat,
seat->operation = OP_MOVE_FLOATING; seat->operation = OP_MOVE_FLOATING;
seat->op_container = con; seat->op_container = con;
seat->op_button = button; 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); 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_con_ly = con->y;
seat->op_ref_width = con->width; seat->op_ref_width = con->width;
seat->op_ref_height = con->height; 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 ? const char *image = edge == WLR_EDGE_NONE ?
"se-resize" : wlr_xcursor_get_resize_name(edge); "se-resize" : wlr_xcursor_get_resize_name(edge);

10
sway/tree/container.c
View file

@ -358,7 +358,6 @@ struct sway_container *container_at(struct sway_workspace *workspace,
struct wlr_surface **surface, double *sx, double *sy) { struct wlr_surface **surface, double *sx, double *sy) {
struct sway_container *c; struct sway_container *c;
// Focused view's popups
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = seat_get_focused_container(seat); struct sway_container *focus = seat_get_focused_container(seat);
bool is_floating = focus && container_is_floating_or_child(focus); bool is_floating = focus && container_is_floating_or_child(focus);
@ -370,14 +369,11 @@ struct sway_container *container_at(struct sway_workspace *workspace,
} }
*surface = NULL; *surface = NULL;
} }
// Cast a ray to handle floating windows // Floating
for (int i = workspace->floating->length - 1; i >= 0; --i) { if ((c = floating_container_at(lx, ly, surface ,sx ,sy))) {
struct sway_container *cn = workspace->floating->items[i];
if (cn->view && (c = surface_at_view(cn, lx, ly, surface, sx, sy))) {
return c; return c;
} }
} // Tiling (focused)
// If focused is tiling, focused view's non-popups
if (focus && focus->view && !is_floating) { if (focus && focus->view && !is_floating) {
if ((c = surface_at_view(focus, lx, ly, surface, sx, sy))) { if ((c = surface_at_view(focus, lx, ly, surface, sx, sy))) {
return c; return c;