1 files changed, 24 insertions, 5 deletions

diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index c71abce7..6221b7b9 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -2,9 +2,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-server-core.h>
+#include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_output.h>
+#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_subcompositor.h>
+#include <wlr/types/wlr_xdg_shell.h>
 #include "log.h"
 #include "sway/scene_descriptor.h"
 #include "sway/desktop/transaction.h"
@@ -16,7 +19,6 @@
 #include "sway/server.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/workspace.h"
-#include <wlr/types/wlr_scene.h>
 
 struct wlr_layer_surface_v1 *toplevel_layer_surface_from_surface(
                 struct wlr_surface *surface) {
@@ -85,6 +87,8 @@ void arrange_layers(struct sway_output *output) {
                 sway_log(SWAY_DEBUG, "Usable area changed, rearranging output");
                 output->usable_area = usable_area;
                 arrange_output(output);
+        } else {
+                arrange_popups(root->layers.popup);
         }
 }
 
@@ -120,10 +124,21 @@ static struct sway_layer_surface *sway_layer_surface_create(
                 return NULL;
         }
 
+        surface->desc.relative = &scene->tree->node;
+
+        if (!scene_descriptor_assign(&popups->node,
+                        SWAY_SCENE_DESC_POPUP, &surface->desc)) {
+                sway_log(SWAY_ERROR, "Failed to allocate a popup scene descriptor");
+                wlr_scene_node_destroy(&popups->node);
+                free(surface);
+                return NULL;
+        }
+
         surface->tree = scene->tree;
         surface->scene = scene;
         surface->layer_surface = scene->layer_surface;
         surface->popups = popups;
+        surface->layer_surface->data = surface;
 
         return surface;
 }
@@ -197,6 +212,8 @@ static void handle_node_destroy(struct wl_listener *listener, void *data) {
         wl_list_remove(&layer->node_destroy.link);
         wl_list_remove(&layer->output_destroy.link);
 
+        layer->layer_surface->data = NULL;
+
         free(layer);
 }
 
@@ -222,10 +239,6 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) {
                 arrange_layers(surface->output);
                 transaction_commit_dirty();
         }
-
-        int lx, ly;
-        wlr_scene_node_coords(&surface->scene->tree->node, &lx, &ly);
-        wlr_scene_node_set_position(&surface->popups->node, lx, ly);
 }
 
 static void handle_map(struct wl_listener *listener, void *data) {
@@ -420,6 +433,12 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
 
         surface->output = output;
 
+        // now that the surface's output is known, we can advertise its scale
+        wlr_fractional_scale_v1_notify_scale(surface->layer_surface->surface,
+                layer_surface->output->scale);
+        wlr_surface_set_preferred_buffer_scale(surface->layer_surface->surface,
+                ceil(layer_surface->output->scale));
+
         surface->surface_commit.notify = handle_surface_commit;
         wl_signal_add(&layer_surface->surface->events.commit,
                 &surface->surface_commit);