summaryrefslogtreecommitdiff
path: root/sway/config.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/config.c')
-rw-r--r--sway/config.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sway/config.c b/sway/config.c
index 83129524..25566213 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -863,12 +863,12 @@ void apply_output_config(struct output_config *oc, swayc_t *output) {
output->width = oc->width;
output->height = oc->height;
- sway_log(L_DEBUG, "Set %s size to %ix%i", oc->name, oc->width, oc->height);
+ sway_log(L_DEBUG, "Set %s size to %ix%i (%d)", oc->name, oc->width, oc->height, oc->scale);
struct wlc_size new_size = { .w = oc->width, .h = oc->height };
- wlc_output_set_resolution(output->handle, &new_size);
- }
- if (oc && oc->scale != 1) {
- wlc_output_set_scale(output->handle, (int32_t)oc->scale);
+ wlc_output_set_resolution(output->handle, &new_size, (uint32_t)oc->scale);
+ } else if (oc && oc->scale != 1) {
+ const struct wlc_size *new_size = wlc_output_get_resolution(output->handle);
+ wlc_output_set_resolution(output->handle, new_size, (uint32_t)oc->scale);
}
// Find position for it