Merge pull request #1526 from emersion/fractional-output-scale

Add support for fractional output scale

2 files changed, 3 insertions, 3 deletions

diff --git a/sway/commands/output.c b/sway/commands/output.c
index d71e4d8d..7988e3e4 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -144,7 +144,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
                                 goto fail;
                         }
                         char *end;
-                        output->scale = strtol(argv[i], &end, 10);
+                        output->scale = strtof(argv[i], &end);
                         if (*end) {
                                 error = cmd_results_new(CMD_INVALID, "output",
                                         "Invalid scale.");
@@ -278,7 +278,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
         }
 
         sway_log(L_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz "
-                "position %d,%d scale %d transform %d) (bg %s %s)",
+                "position %d,%d scale %f transform %d) (bg %s %s)",
                 output->name, output->enabled, output->width, output->height,
                 output->refresh_rate, output->x, output->y, output->scale,
                 output->transform, output->background, output->background_option);
diff --git a/sway/config/output.c b/sway/config/output.c
index dc9ee37c..ff3f73a3 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -111,7 +111,7 @@ void apply_output_config(struct output_config *oc, swayc_t *output) {
                 set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate);
         }
         if (oc && oc->scale > 0) {
-                sway_log(L_DEBUG, "Set %s scale to %d", oc->name, oc->scale);
+                sway_log(L_DEBUG, "Set %s scale to %f", oc->name, oc->scale);
                 wlr_output_set_scale(wlr_output, oc->scale);
         }
         if (oc && oc->transform >= 0) {