diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-10 16:58:32 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-10 16:58:32 +1000 |
commit | 416bb7a214d6f140a4eb7a1b8b0581fc78d71cda (patch) | |
tree | 621dc8415c317cd83d596161e3145f99f5cc1370 /sway/input/seat.c | |
parent | Merge pull request #2810 from RyanDwyer/fix-docs-backandforth (diff) | |
download | sway-416bb7a214d6f140a4eb7a1b8b0581fc78d71cda.tar.gz sway-416bb7a214d6f140a4eb7a1b8b0581fc78d71cda.tar.zst sway-416bb7a214d6f140a4eb7a1b8b0581fc78d71cda.zip |
Fix floating click events
* Set focus to a floating container when clicking its title bar.
* Raise floating when user clicks title bar or decorations (in the
seat_begin functions).
* In container_at, it only returned a floating container if the user had
clicked the surface. This makes it use floating_container_at instead.
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r-- | sway/input/seat.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index f418785d..daf5b160 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -1038,7 +1038,7 @@ void seat_begin_down(struct sway_seat *seat, struct sway_container *con, | |||
1038 | seat->op_moved = false; | 1038 | seat->op_moved = false; |
1039 | 1039 | ||
1040 | // In case the container was not raised by gaining focus, raise on click | 1040 | // In case the container was not raised by gaining focus, raise on click |
1041 | if (con && !config->raise_floating) { | 1041 | if (!config->raise_floating) { |
1042 | container_raise_floating(con); | 1042 | container_raise_floating(con); |
1043 | } | 1043 | } |
1044 | } | 1044 | } |
@@ -1052,6 +1052,12 @@ void seat_begin_move_floating(struct sway_seat *seat, | |||
1052 | seat->operation = OP_MOVE_FLOATING; | 1052 | seat->operation = OP_MOVE_FLOATING; |
1053 | seat->op_container = con; | 1053 | seat->op_container = con; |
1054 | seat->op_button = button; | 1054 | seat->op_button = button; |
1055 | |||
1056 | // In case the container was not raised by gaining focus, raise on click | ||
1057 | if (!config->raise_floating) { | ||
1058 | container_raise_floating(con); | ||
1059 | } | ||
1060 | |||
1055 | cursor_set_image(seat->cursor, "grab", NULL); | 1061 | cursor_set_image(seat->cursor, "grab", NULL); |
1056 | } | 1062 | } |
1057 | 1063 | ||
@@ -1085,6 +1091,11 @@ void seat_begin_resize_floating(struct sway_seat *seat, | |||
1085 | seat->op_ref_con_ly = con->y; | 1091 | seat->op_ref_con_ly = con->y; |
1086 | seat->op_ref_width = con->width; | 1092 | seat->op_ref_width = con->width; |
1087 | seat->op_ref_height = con->height; | 1093 | seat->op_ref_height = con->height; |
1094 | // | ||
1095 | // In case the container was not raised by gaining focus, raise on click | ||
1096 | if (!config->raise_floating) { | ||
1097 | container_raise_floating(con); | ||
1098 | } | ||
1088 | 1099 | ||
1089 | const char *image = edge == WLR_EDGE_NONE ? | 1100 | const char *image = edge == WLR_EDGE_NONE ? |
1090 | "se-resize" : wlr_xcursor_get_resize_name(edge); | 1101 | "se-resize" : wlr_xcursor_get_resize_name(edge); |