diff options
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( | |||
109 | } | 109 | } |
110 | 110 | ||
111 | struct sway_container *c; | 111 | struct sway_container *c; |
112 | if ((c = floating_container_at(lx, ly, surface, sx, sy))) { | ||
113 | return c; | ||
114 | } | ||
115 | if ((c = container_at(ws, lx, ly, surface, sx, sy))) { | 112 | if ((c = container_at(ws, lx, ly, surface, sx, sy))) { |
116 | return c; | 113 | return c; |
117 | } | 114 | } |
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, | |||
737 | } | 737 | } |
738 | } | 738 | } |
739 | 739 | ||
740 | // Close any popups on the old focus | ||
741 | if (last_focus && last_focus != container) { | ||
742 | if (last_focus->type == C_VIEW) { | ||
743 | view_close_popups(last_focus->sway_view); | ||
744 | } | ||
745 | } | ||
746 | |||
740 | if (last_focus) { | 747 | if (last_focus) { |
741 | if (last_workspace) { | 748 | if (last_workspace) { |
742 | if (notify && last_workspace != new_workspace) { | 749 | if (notify && last_workspace != new_workspace) { |