aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-03-10 15:00:15 -0400
committerDrew DeVault <sir@cmpwn.com>2019-03-10 13:07:32 -0600
commit9a75f0010f9bc448dfedb5de6e484719613d6428 (patch)
tree8cf5d48dac797e2d418418b1bb0f3e053f87e5fd
parentc02d2a01289581fd3c32a22e1a498ffad736281d (diff)
downloadsway-9a75f0010f9bc448dfedb5de6e484719613d6428.zip
sway-9a75f0010f9bc448dfedb5de6e484719613d6428.tar.gz
sway-9a75f0010f9bc448dfedb5de6e484719613d6428.tar.bz2
arrange: use int not size_t for title offsets
This changes `apply_tabbed_layout` and `apply_stacked_layout` to use `int` instead of `size_t`. This is necessary for tabbed and stacked containers to be positioned correctly when the y-location is negative. The reasoning for this is signed plus unsigned is always an unsigned value. This was causing the y-location of the container to be positioned near `INT_MIN` due to an unsigned integer underflow
-rw-r--r--sway/tree/arrange.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c
index da372aa..438a213 100644
--- a/sway/tree/arrange.c
+++ b/sway/tree/arrange.c
@@ -99,7 +99,7 @@ static void apply_tabbed_layout(list_t *children, struct wlr_box *parent) {
}
for (int i = 0; i < children->length; ++i) {
struct sway_container *child = children->items[i];
- size_t parent_offset = child->view ? 0 : container_titlebar_height();
+ int parent_offset = child->view ? 0 : container_titlebar_height();
container_remove_gaps(child);
child->x = parent->x;
child->y = parent->y + parent_offset;
@@ -115,7 +115,7 @@ static void apply_stacked_layout(list_t *children, struct wlr_box *parent) {
}
for (int i = 0; i < children->length; ++i) {
struct sway_container *child = children->items[i];
- size_t parent_offset = child->view ? 0 :
+ int parent_offset = child->view ? 0 :
container_titlebar_height() * children->length;
container_remove_gaps(child);
child->x = parent->x;