aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/resize.c
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-04-06 16:13:26 -0400
committerLibravatar GitHub <noreply@github.com>2018-04-06 16:13:26 -0400
commit640232eb225058a18f20190235f679caf678e1f7 (patch)
tree4323a9130346ca4d836b0ae70c03877e13310bfc /sway/commands/resize.c
parentMerge pull request #1757 from swaywm/boooooooxes (diff)
downloadsway-640232eb225058a18f20190235f679caf678e1f7.tar.gz
sway-640232eb225058a18f20190235f679caf678e1f7.tar.zst
sway-640232eb225058a18f20190235f679caf678e1f7.zip
Revert "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 8e295f65..93c1fe7d 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->box.x : c->box.y; 51 return a == RESIZE_AXIS_HORIZONTAL ? c->x : c->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->box.width : c->box.height; 55 return a == RESIZE_AXIS_HORIZONTAL ? c->width : c->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->box.width * pct; 199 amount = (float)current->width * pct;
200 break; 200 break;
201 case RESIZE_AXIS_VERTICAL: 201 case RESIZE_AXIS_VERTICAL:
202 amount = (float)current->box.height * pct; 202 amount = (float)current->height * pct;
203 break; 203 break;
204 default: 204 default:
205 sway_assert(0, "invalid resize axis"); 205 sway_assert(0, "invalid resize axis");