diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-07-29 07:35:43 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2016-07-29 07:35:43 -0400 |
commit | 966127222439620233c27ab835062f6cc69e23ea (patch) | |
tree | 7e233c68e7063b7c0c7857a73111e95141fb5b44 /sway/container.c | |
parent | Merge pull request #802 from acrisci/feature/timestamp-log-messages (diff) | |
parent | Update IPC JSON responses for HiDPI setups (diff) | |
download | sway-4ab01e98832fa105c7c01f72f6a6d24994514a06.tar.gz sway-4ab01e98832fa105c7c01f72f6a6d24994514a06.tar.zst sway-4ab01e98832fa105c7c01f72f6a6d24994514a06.zip |
Merge remote-tracking branch 'origin/hidpi'0.9-rc2
Diffstat (limited to 'sway/container.c')
-rw-r--r-- | sway/container.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sway/container.c b/sway/container.c index 67aa6851..c922bac3 100644 --- a/sway/container.c +++ b/sway/container.c | |||
@@ -102,7 +102,8 @@ static void update_root_geometry() { | |||
102 | // New containers | 102 | // New containers |
103 | 103 | ||
104 | swayc_t *new_output(wlc_handle handle) { | 104 | swayc_t *new_output(wlc_handle handle) { |
105 | const struct wlc_size *size = wlc_output_get_resolution(handle); | 105 | struct wlc_size size; |
106 | output_get_scaled_size(handle, &size); | ||
106 | const char *name = wlc_output_get_name(handle); | 107 | const char *name = wlc_output_get_name(handle); |
107 | // Find current outputs to see if this already exists | 108 | // Find current outputs to see if this already exists |
108 | { | 109 | { |
@@ -148,8 +149,8 @@ swayc_t *new_output(wlc_handle handle) { | |||
148 | swayc_t *output = new_swayc(C_OUTPUT); | 149 | swayc_t *output = new_swayc(C_OUTPUT); |
149 | output->handle = handle; | 150 | output->handle = handle; |
150 | output->name = name ? strdup(name) : NULL; | 151 | output->name = name ? strdup(name) : NULL; |
151 | output->width = size->w; | 152 | output->width = size.w; |
152 | output->height = size->h; | 153 | output->height = size.h; |
153 | output->unmanaged = create_list(); | 154 | output->unmanaged = create_list(); |
154 | output->bg_pid = 0; | 155 | output->bg_pid = 0; |
155 | 156 | ||