diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2014-03-10 13:41:35 -0700 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-03-10 13:41:35 -0700 |
| commit | 3c2e66bb6ce386d864ff0234b95273a47fc9983e (patch) | |
| tree | fe48a1f57e02edd8562863a17eb00852de7a7567 /src/compositor-x11.c | |
| parent | d89a0946a77da07036e0de43ad31a61c376a82b7 (diff) | |
| download | weston-3c2e66bb6ce386d864ff0234b95273a47fc9983e.tar.gz | |
x11-backend: Override scale from weston.ini if --scale is passed
This matches our behavior for width and height, and is useful for launching
weston with a different scale factor without editing the .ini file.
Diffstat (limited to 'src/compositor-x11.c')
| -rw-r--r-- | src/compositor-x11.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/compositor-x11.c b/src/compositor-x11.c index bb4ac9f8..ffbef400 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -1565,6 +1565,9 @@ x11_compositor_create(struct wl_display *display, height = option_height; weston_config_section_get_int(section, "scale", &scale, 1); + if (option_scale) + scale = option_scale; + weston_config_section_get_string(section, "transform", &t, "normal"); transform = parse_transform(t, name); |