aboutsummaryrefslogtreecommitdiff
path: root/sway/tree
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-10-10 16:58:32 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-10-10 16:58:32 +1000
commit416bb7a214d6f140a4eb7a1b8b0581fc78d71cda (patch)
tree621dc8415c317cd83d596161e3145f99f5cc1370 /sway/tree
parent2bd561d2b71830b1be5546112faf035383c8615e (diff)
downloadsway-416bb7a214d6f140a4eb7a1b8b0581fc78d71cda.tar.xz
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/tree')
-rw-r--r--sway/tree/container.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 1664514a..f36fe4b0 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -358,7 +358,6 @@ struct sway_container *container_at(struct sway_workspace *workspace,
struct wlr_surface **surface, double *sx, double *sy) {
struct sway_container *c;
- // Focused view's popups
struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = seat_get_focused_container(seat);
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;
}
- // Cast a ray to handle floating windows
- for (int i = workspace->floating->length - 1; i >= 0; --i) {
- struct sway_container *cn = workspace->floating->items[i];
- if (cn->view && (c = surface_at_view(cn, lx, ly, surface, sx, sy))) {
- return c;
- }
+ // Floating
+ if ((c = floating_container_at(lx, ly, surface ,sx ,sy))) {
+ return c;
}
- // If focused is tiling, focused view's non-popups
+ // Tiling (focused)
if (focus && focus->view && !is_floating) {
if ((c = surface_at_view(focus, lx, ly, surface, sx, sy))) {
return c;