aboutsummaryrefslogtreecommitdiffstats
path: root/sway/desktop/xdg_shell.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-02 23:30:26 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-02 23:36:36 +1000
commit8392eae40f17e550338b8b7058d8e9c1a6ad4f78 (patch)
treeffefcdd261970549f8b83adae8d93b6c3b9ebbbb /sway/desktop/xdg_shell.c
parentMerge pull request #2366 from RedSoxFan/nagbar (diff)
downloadsway-8392eae40f17e550338b8b7058d8e9c1a6ad4f78.tar.gz
sway-8392eae40f17e550338b8b7058d8e9c1a6ad4f78.tar.zst
sway-8392eae40f17e550338b8b7058d8e9c1a6ad4f78.zip
Revert "Revert "Fix popups""
This reverts commit 9aa258d33a9baa42895214da7e82f4568fcb8f76. Reverting the revert, so that popups can be fixed.
Diffstat (limited to 'sway/desktop/xdg_shell.c')
-rw-r--r--sway/desktop/xdg_shell.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 9d6b27e5..b364663d 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -179,6 +179,14 @@ static void for_each_surface(struct sway_view *view,
179 user_data); 179 user_data);
180} 180}
181 181
182static void for_each_popup(struct sway_view *view,
183 wlr_surface_iterator_func_t iterator, void *user_data) {
184 if (xdg_shell_view_from_view(view) == NULL) {
185 return;
186 }
187 wlr_xdg_surface_for_each_popup(view->wlr_xdg_surface, iterator, user_data);
188}
189
182static void _close(struct sway_view *view) { 190static void _close(struct sway_view *view) {
183 if (xdg_shell_view_from_view(view) == NULL) { 191 if (xdg_shell_view_from_view(view) == NULL) {
184 return; 192 return;
@@ -219,6 +227,7 @@ static const struct sway_view_impl view_impl = {
219 .set_fullscreen = set_fullscreen, 227 .set_fullscreen = set_fullscreen,
220 .wants_floating = wants_floating, 228 .wants_floating = wants_floating,
221 .for_each_surface = for_each_surface, 229 .for_each_surface = for_each_surface,
230 .for_each_popup = for_each_popup,
222 .close = _close, 231 .close = _close,
223 .close_popups = close_popups, 232 .close_popups = close_popups,
224 .destroy = destroy, 233 .destroy = destroy,