Merge branch 'master' into display-destroy

This commit is contained in:
emersion 2017-12-14 20:29:30 +01:00
commit 75ef7860bb
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
19 changed files with 111 additions and 28 deletions

View file

@ -321,7 +321,7 @@ void output_add_notify(struct wl_listener *listener, void *data) {
set_mode(wlr_output, output_config);
}
wlr_output_set_scale(wlr_output, output_config->scale);
wlr_output_transform(wlr_output, output_config->transform);
wlr_output_set_transform(wlr_output, output_config->transform);
wlr_output_layout_add(desktop->layout, wlr_output, output_config->x,
output_config->y);
} else {