diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-08-01 22:02:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 22:02:12 -0400 |
| commit | 9564c73c0ddca9d7b45f0476fcaee8bd878d8345 (patch) | |
| tree | 4405c7ab30e25c5234a61280a66d406921c52253 /sway/input | |
| parent | 4cc0855f21a2704314aa7b8973ceae7a8b463a1a (diff) | |
| parent | 7a59508da467a3b793e355e28ae67ce04633761c (diff) | |
| download | sway-9564c73c0ddca9d7b45f0476fcaee8bd878d8345.tar.xz | |
Merge pull request #2391 from RyanDwyer/fix-popups-v2
Fix popups (v2)
Diffstat (limited to 'sway/input')
| -rw-r--r-- | sway/input/cursor.c | 3 | ||||
| -rw-r--r-- | sway/input/seat.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index d6fdc1da..79f6ec46 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -109,9 +109,6 @@ static struct sway_container *container_at_coords( } struct sway_container *c; - if ((c = floating_container_at(lx, ly, surface, sx, sy))) { - return c; - } if ((c = container_at(ws, lx, ly, surface, sx, sy))) { return c; } diff --git a/sway/input/seat.c b/sway/input/seat.c index fe3cbc53..869560af 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -737,6 +737,13 @@ void seat_set_focus_warp(struct sway_seat *seat, } } + // Close any popups on the old focus + if (last_focus && last_focus != container) { + if (last_focus->type == C_VIEW) { + view_close_popups(last_focus->sway_view); + } + } + if (last_focus) { if (last_workspace) { if (notify && last_workspace != new_workspace) { |