aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/resize.c
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-04-06 16:16:05 -0400
committerGitHub <noreply@github.com>2018-04-06 16:16:05 -0400
commit5c31b06d88135a62bd917a61e770c8219f6d5d72 (patch)
tree4323a9130346ca4d836b0ae70c03877e13310bfc /sway/commands/resize.c
parent656ef558a2a8d55cf77cbcc8ce01c861cb78ac97 (diff)
parent640232eb225058a18f20190235f679caf678e1f7 (diff)
Merge pull request #1758 from swaywm/revert-1757-boooooooxes
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) {
}
static int parallel_coord(struct sway_container *c, enum resize_axis a) {
- return a == RESIZE_AXIS_HORIZONTAL ? c->box.x : c->box.y;
+ return a == RESIZE_AXIS_HORIZONTAL ? c->x : c->y;
}
static int parallel_size(struct sway_container *c, enum resize_axis a) {
- return a == RESIZE_AXIS_HORIZONTAL ? c->box.width : c->box.height;
+ return a == RESIZE_AXIS_HORIZONTAL ? c->width : c->height;
}
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) {
float pct = amount / 100.0f;
switch (axis) {
case RESIZE_AXIS_HORIZONTAL:
- amount = (float)current->box.width * pct;
+ amount = (float)current->width * pct;
break;
case RESIZE_AXIS_VERTICAL:
- amount = (float)current->box.height * pct;
+ amount = (float)current->height * pct;
break;
default:
sway_assert(0, "invalid resize axis");