2 files changed, 9 insertions, 1 deletions

diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index 4b2584b6..6221b7b9 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -2,6 +2,7 @@
 #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>
@@ -432,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);
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 70987feb..2722e556 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -609,7 +609,8 @@ static void output_manager_apply(struct sway_server *server,
                 }
         }
 
-        bool ok = apply_output_configs(configs, configs_len, test_only);
+        sort_output_configs_by_priority(configs, configs_len);
+        bool ok = apply_output_configs(configs, configs_len, test_only, false);
         for (size_t idx = 0; idx < configs_len; idx++) {
                 struct matched_output_config *cfg = &configs[idx];