aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/resize.c
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-04-06 15:03:05 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2018-04-06 15:38:37 -0400
commit764489e73760534d49760af123cae46109564e86 (patch)
tree243104969dc80855d313faf5a0d360dd5508dc52 /sway/commands/resize.c
parentMerge pull request #1755 from emersion/view-child-hidpi (diff)
downloadsway-764489e73760534d49760af123cae46109564e86.tar.gz
sway-764489e73760534d49760af123cae46109564e86.tar.zst
sway-764489e73760534d49760af123cae46109564e86.zip
Break everything^W^WUse wlr_box for sway_container
Diffstat (limited to 'sway/commands/resize.c')
-rw-r--r--sway/commands/resize.c8
1 files changed, 4 insertions, 4 deletions
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
50static int parallel_coord(struct sway_container *c, enum resize_axis a) { 50static 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
54static int parallel_size(struct sway_container *c, enum resize_axis a) { 54static 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
58static void resize_tiled(int amount, enum resize_axis axis) { 58static 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");