Introduce container_is_transient_for

2 files changed, 10 insertions, 17 deletions

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 0bcdcac1..adc1ee10 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -329,15 +329,12 @@ static void send_frame_done(struct sway_output *output, struct timespec *when) {
                                 workspace->current.fullscreen, &data);
                 container_for_each_child(workspace->current.fullscreen,
                                 send_frame_done_container_iterator, &data);
-                if (config->popup_during_fullscreen == POPUP_SMART &&
-                                workspace->current.fullscreen->view) {
-                        for (int i = 0; i < workspace->current.floating->length; ++i) {
-                                struct sway_container *floater =
-                                        workspace->current.floating->items[i];
-                                if (floater->view && view_is_transient_for(floater->view,
-                                                        workspace->current.fullscreen->view)) {
-                                        send_frame_done_container_iterator(floater, &data);
-                                }
+                for (int i = 0; i < workspace->current.floating->length; ++i) {
+                        struct sway_container *floater =
+                                workspace->current.floating->items[i];
+                        if (container_is_transient_for(floater,
+                                                workspace->current.fullscreen)) {
+                                send_frame_done_container_iterator(floater, &data);
                         }
                 }
 #ifdef HAVE_XWAYLAND
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index c2a0d29f..765317db 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -962,14 +962,10 @@ void output_render(struct sway_output *output, struct timespec *when,
                                         fullscreen_con->current.focused);
                 }
 
-                if (config->popup_during_fullscreen == POPUP_SMART &&
-                                fullscreen_con->view) {
-                        for (int i = 0; i < workspace->floating->length; ++i) {
-                                struct sway_container *floater = workspace->floating->items[i];
-                                if (floater->view && view_is_transient_for(
-                                                        floater->view, fullscreen_con->view)) {
-                                        render_floating_container(output, damage, floater);
-                                }
+                for (int i = 0; i < workspace->floating->length; ++i) {
+                        struct sway_container *floater = workspace->floating->items[i];
+                        if (container_is_transient_for(floater, fullscreen_con)) {
+                                render_floating_container(output, damage, floater);
                         }
                 }
 #ifdef HAVE_XWAYLAND