diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-06 15:03:05 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2018-04-06 15:38:37 -0400 |
commit | 764489e73760534d49760af123cae46109564e86 (patch) | |
tree | 243104969dc80855d313faf5a0d360dd5508dc52 /sway/commands | |
parent | Merge pull request #1755 from emersion/view-child-hidpi (diff) | |
download | sway-764489e73760534d49760af123cae46109564e86.tar.gz sway-764489e73760534d49760af123cae46109564e86.tar.zst sway-764489e73760534d49760af123cae46109564e86.zip |
Break everything^W^WUse wlr_box for sway_container
Diffstat (limited to 'sway/commands')
-rw-r--r-- | sway/commands/layout.c | 2 | ||||
-rw-r--r-- | sway/commands/move.c | 7 | ||||
-rw-r--r-- | sway/commands/resize.c | 8 |
3 files changed, 9 insertions, 8 deletions
diff --git a/sway/commands/layout.c b/sway/commands/layout.c index 4c49a627..162173c5 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c | |||
@@ -49,7 +49,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) { | |||
49 | } | 49 | } |
50 | } | 50 | } |
51 | 51 | ||
52 | arrange_windows(parent, parent->width, parent->height); | 52 | arrange_windows(parent, parent->box.width, parent->box.height); |
53 | 53 | ||
54 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 54 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
55 | } | 55 | } |
diff --git a/sway/commands/move.c b/sway/commands/move.c index c954ab94..e8668ce7 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c | |||
@@ -95,7 +95,8 @@ static struct cmd_results *cmd_move_container(struct sway_container *current, | |||
95 | } | 95 | } |
96 | struct sway_container *source = container_parent(current, C_OUTPUT); | 96 | struct sway_container *source = container_parent(current, C_OUTPUT); |
97 | struct sway_container *destination = output_in_direction(argv[3], | 97 | struct sway_container *destination = output_in_direction(argv[3], |
98 | source->sway_output->wlr_output, current->x, current->y); | 98 | source->sway_output->wlr_output, |
99 | current->box.x, current->box.y); | ||
99 | if (!destination) { | 100 | if (!destination) { |
100 | return cmd_results_new(CMD_FAILURE, "move workspace", | 101 | return cmd_results_new(CMD_FAILURE, "move workspace", |
101 | "Can't find output with name/direction '%s'", argv[3]); | 102 | "Can't find output with name/direction '%s'", argv[3]); |
@@ -124,8 +125,8 @@ static struct cmd_results *cmd_move_workspace(struct sway_container *current, | |||
124 | return cmd_results_new(CMD_INVALID, "move", expected_syntax); | 125 | return cmd_results_new(CMD_INVALID, "move", expected_syntax); |
125 | } | 126 | } |
126 | struct sway_container *source = container_parent(current, C_OUTPUT); | 127 | struct sway_container *source = container_parent(current, C_OUTPUT); |
127 | int center_x = current->width / 2 + current->x, | 128 | int center_x = current->box.width / 2 + current->box.x, |
128 | center_y = current->height / 2 + current->y; | 129 | center_y = current->box.height / 2 + current->box.y; |
129 | struct sway_container *destination = output_in_direction(argv[3], | 130 | struct sway_container *destination = output_in_direction(argv[3], |
130 | source->sway_output->wlr_output, center_x, center_y); | 131 | source->sway_output->wlr_output, center_x, center_y); |
131 | if (!destination) { | 132 | if (!destination) { |
diff --git a/sway/commands/resize.c b/sway/commands/resize.c index 93c1fe7d..8e295f65 100644 --- a/sway/commands/resize.c +++ b/sway/commands/resize.c | |||
@@ -48,11 +48,11 @@ static enum resize_axis parse_resize_axis(const char *axis) { | |||
48 | } | 48 | } |
49 | 49 | ||
50 | static int parallel_coord(struct sway_container *c, enum resize_axis a) { | 50 | static int parallel_coord(struct sway_container *c, enum resize_axis a) { |
51 | return a == RESIZE_AXIS_HORIZONTAL ? c->x : c->y; | 51 | return a == RESIZE_AXIS_HORIZONTAL ? c->box.x : c->box.y; |
52 | } | 52 | } |
53 | 53 | ||
54 | static int parallel_size(struct sway_container *c, enum resize_axis a) { | 54 | static int parallel_size(struct sway_container *c, enum resize_axis a) { |
55 | return a == RESIZE_AXIS_HORIZONTAL ? c->width : c->height; | 55 | return a == RESIZE_AXIS_HORIZONTAL ? c->box.width : c->box.height; |
56 | } | 56 | } |
57 | 57 | ||
58 | static void resize_tiled(int amount, enum resize_axis axis) { | 58 | static void resize_tiled(int amount, enum resize_axis axis) { |
@@ -196,10 +196,10 @@ static void resize(int amount, enum resize_axis axis, enum resize_unit unit) { | |||
196 | float pct = amount / 100.0f; | 196 | float pct = amount / 100.0f; |
197 | switch (axis) { | 197 | switch (axis) { |
198 | case RESIZE_AXIS_HORIZONTAL: | 198 | case RESIZE_AXIS_HORIZONTAL: |
199 | amount = (float)current->width * pct; | 199 | amount = (float)current->box.width * pct; |
200 | break; | 200 | break; |
201 | case RESIZE_AXIS_VERTICAL: | 201 | case RESIZE_AXIS_VERTICAL: |
202 | amount = (float)current->height * pct; | 202 | amount = (float)current->box.height * pct; |
203 | break; | 203 | break; |
204 | default: | 204 | default: |
205 | sway_assert(0, "invalid resize axis"); | 205 | sway_assert(0, "invalid resize axis"); |