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/handlers.c | |
parent | Merge pull request #802 from acrisci/feature/timestamp-log-messages (diff) | |
parent | Update IPC JSON responses for HiDPI setups (diff) | |
download | sway-966127222439620233c27ab835062f6cc69e23ea.tar.gz sway-966127222439620233c27ab835062f6cc69e23ea.tar.zst sway-966127222439620233c27ab835062f6cc69e23ea.zip |
Merge remote-tracking branch 'origin/hidpi'0.9-rc2
Diffstat (limited to 'sway/handlers.c')
-rw-r--r-- | sway/handlers.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/handlers.c b/sway/handlers.c index 405df1c8..cb608bec 100644 --- a/sway/handlers.c +++ b/sway/handlers.c | |||
@@ -56,7 +56,8 @@ static struct background_config *if_background_find_config(struct wl_client *cli | |||
56 | } | 56 | } |
57 | 57 | ||
58 | static struct wlc_geometry compute_panel_geometry(struct panel_config *config) { | 58 | static struct wlc_geometry compute_panel_geometry(struct panel_config *config) { |
59 | const struct wlc_size resolution = *wlc_output_get_resolution(config->output); | 59 | struct wlc_size resolution; |
60 | output_get_scaled_size(config->output, &resolution); | ||
60 | const struct wlc_geometry *old = wlc_view_get_geometry(config->handle); | 61 | const struct wlc_geometry *old = wlc_view_get_geometry(config->handle); |
61 | struct wlc_geometry new; | 62 | struct wlc_geometry new; |
62 | 63 | ||