diff options
author | emersion <contact@emersion.fr> | 2018-06-03 18:46:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-03 18:46:26 +0100 |
commit | 4bc88772ec15ce0070fb06fe3c242cb65dc34b01 (patch) | |
tree | aed41175b26f4ad2f8be21e9ae634f4b2998699c | |
parent | Merge pull request #2093 from emersion/damage-debug (diff) | |
parent | Fix initial workspace orientation on a rotated output (diff) | |
download | sway-4bc88772ec15ce0070fb06fe3c242cb65dc34b01.tar.gz sway-4bc88772ec15ce0070fb06fe3c242cb65dc34b01.tar.zst sway-4bc88772ec15ce0070fb06fe3c242cb65dc34b01.zip |
Merge pull request #2100 from RyanDwyer/fix-workspace-orientation
Fix initial workspace orientation on a rotated output
-rw-r--r-- | sway/tree/output.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c index 6c7044a2..8823eba0 100644 --- a/sway/tree/output.c +++ b/sway/tree/output.c | |||
@@ -8,10 +8,6 @@ | |||
8 | 8 | ||
9 | struct sway_container *output_create( | 9 | struct sway_container *output_create( |
10 | struct sway_output *sway_output) { | 10 | struct sway_output *sway_output) { |
11 | struct wlr_box size; | ||
12 | wlr_output_effective_resolution(sway_output->wlr_output, &size.width, | ||
13 | &size.height); | ||
14 | |||
15 | const char *name = sway_output->wlr_output->name; | 11 | const char *name = sway_output->wlr_output->name; |
16 | char identifier[128]; | 12 | char identifier[128]; |
17 | output_get_identifier(identifier, sizeof(identifier), sway_output); | 13 | output_get_identifier(identifier, sizeof(identifier), sway_output); |
@@ -54,6 +50,12 @@ struct sway_container *output_create( | |||
54 | container_add_child(&root_container, output); | 50 | container_add_child(&root_container, output); |
55 | load_swaybars(); | 51 | load_swaybars(); |
56 | 52 | ||
53 | struct wlr_box size; | ||
54 | wlr_output_effective_resolution(sway_output->wlr_output, &size.width, | ||
55 | &size.height); | ||
56 | output->width = size.width; | ||
57 | output->height = size.height; | ||
58 | |||
57 | // Create workspace | 59 | // Create workspace |
58 | char *ws_name = workspace_next_name(output->name); | 60 | char *ws_name = workspace_next_name(output->name); |
59 | wlr_log(L_DEBUG, "Creating default workspace %s", ws_name); | 61 | wlr_log(L_DEBUG, "Creating default workspace %s", ws_name); |