aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sway/commands/resize.c91
-rw-r--r--sway/sway.5.scd12
2 files changed, 47 insertions, 56 deletions
diff --git a/sway/commands/resize.c b/sway/commands/resize.c
index 49731a64..3530ee5a 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -80,61 +80,46 @@ void container_resize_tiled(struct sway_container *con,
}
// For HORIZONTAL or VERTICAL, we are growing in two directions so select
- // both adjacent siblings. For RIGHT or DOWN, just select the next sibling.
- // For LEFT or UP, convert it to a RIGHT or DOWN resize and reassign con to
- // the previous sibling.
- struct sway_container *prev = NULL;
- struct sway_container *next = NULL;
+ // all adjacent siblings. For RIGHT or DOWN or LEFT or UP select just the
+ // previous or next sibling.
+ list_t *resize = create_list();
list_t *siblings = container_get_siblings(con);
int index = container_sibling_index(con);
if (axis == AXIS_HORIZONTAL || axis == AXIS_VERTICAL) {
- if (index == 0) {
- next = siblings->items[1];
- } else if (index == siblings->length - 1) {
- // Convert edge to top/left
- next = con;
- con = siblings->items[index - 1];
- amount = -amount;
- } else {
- prev = siblings->items[index - 1];
- next = siblings->items[index + 1];
- }
+ list_cat(resize, siblings);
} else if (axis == WLR_EDGE_TOP || axis == WLR_EDGE_LEFT) {
if (!sway_assert(index > 0, "Didn't expect first child")) {
- return;
+ goto cleanup;
}
- next = con;
- con = siblings->items[index - 1];
- amount = -amount;
+ list_add(resize, siblings->items[index - 1]);
+ list_add(resize, con);
} else {
if (!sway_assert(index < siblings->length - 1,
"Didn't expect last child")) {
- return;
+ goto cleanup;
}
- next = siblings->items[index + 1];
+ list_add(resize, con);
+ list_add(resize, siblings->items[index + 1]);
}
// Apply new dimensions
- int sibling_amount = prev ? ceil((double)amount / 2.0) : amount;
+ int sibling_amount = ceil((double)amount / (double)(resize->length - 1));
if (is_horizontal(axis)) {
- if (con->pending.width + amount < MIN_SANE_W) {
- return;
- }
- if (next->pending.width - sibling_amount < MIN_SANE_W) {
- return;
- }
- if (prev && prev->pending.width - sibling_amount < MIN_SANE_W) {
- return;
+ for (int i = 0; i < resize->length; i++) {
+ struct sway_container *sibling = resize->items[i];
+ double change = sibling == con ? amount : -sibling_amount;
+ if (sibling->pending.width + change < MIN_SANE_W) {
+ goto cleanup;
+ }
}
if (con->child_total_width <= 0) {
- return;
+ goto cleanup;
}
// We're going to resize so snap all the width fractions to full pixels
// to avoid rounding issues
- list_t *siblings = container_get_siblings(con);
for (int i = 0; i < siblings->length; ++i) {
struct sway_container *con = siblings->items[i];
con->width_fraction = con->pending.width / con->child_total_width;
@@ -142,30 +127,27 @@ void container_resize_tiled(struct sway_container *con,
double amount_fraction = (double)amount / con->child_total_width;
double sibling_amount_fraction =
- prev ? amount_fraction / 2.0 : amount_fraction;
+ amount_fraction / (double)(resize->length - 1);
- con->width_fraction += amount_fraction;
- next->width_fraction -= sibling_amount_fraction;
- if (prev) {
- prev->width_fraction -= sibling_amount_fraction;
+ for (int i = 0; i < resize->length; i++) {
+ struct sway_container *sibling = resize->items[i];
+ sibling->width_fraction +=
+ sibling == con ? amount_fraction : -sibling_amount_fraction;
}
} else {
- if (con->pending.height + amount < MIN_SANE_H) {
- return;
- }
- if (next->pending.height - sibling_amount < MIN_SANE_H) {
- return;
- }
- if (prev && prev->pending.height - sibling_amount < MIN_SANE_H) {
- return;
+ for (int i = 0; i < resize->length; i++) {
+ struct sway_container *sibling = resize->items[i];
+ double change = sibling == con ? amount : -sibling_amount;
+ if (sibling->pending.height + change < MIN_SANE_H) {
+ goto cleanup;
+ }
}
if (con->child_total_height <= 0) {
- return;
+ goto cleanup;
}
// We're going to resize so snap all the height fractions to full pixels
// to avoid rounding issues
- list_t *siblings = container_get_siblings(con);
for (int i = 0; i < siblings->length; ++i) {
struct sway_container *con = siblings->items[i];
con->height_fraction = con->pending.height / con->child_total_height;
@@ -173,12 +155,12 @@ void container_resize_tiled(struct sway_container *con,
double amount_fraction = (double)amount / con->child_total_height;
double sibling_amount_fraction =
- prev ? amount_fraction / 2.0 : amount_fraction;
+ amount_fraction / (double)(resize->length - 1);
- con->height_fraction += amount_fraction;
- next->height_fraction -= sibling_amount_fraction;
- if (prev) {
- prev->height_fraction -= sibling_amount_fraction;
+ for (int i = 0; i < resize->length; i++) {
+ struct sway_container *sibling = resize->items[i];
+ sibling->height_fraction +=
+ sibling == con ? amount_fraction : -sibling_amount_fraction;
}
}
@@ -187,6 +169,9 @@ void container_resize_tiled(struct sway_container *con,
} else {
arrange_workspace(con->pending.workspace);
}
+
+cleanup:
+ list_free(resize);
}
/**
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index 689783a2..53393bcc 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -302,28 +302,34 @@ set|plus|minus|toggle <amount>
*rename* workspace [<old_name>] to <new_name>
Rename either <old_name> or the focused workspace to the <new_name>
-*resize* shrink|grow width|height [<amount> [px|ppt]]
+*resize* shrink|grow up|right|down|left|width|height [<amount> [px|ppt]]
Resizes the currently focused container by _amount_, specified in pixels or
percentage points. If the units are omitted, floating containers are resized
in px and tiled containers by ppt. _amount_ will default to 10 if omitted.
+ For tiling containers, space is taken/given from the container in the
+ specified direction. If _width_ or _height_ is specified, space will be
+ taken/given from all other containers.
*resize* set height <height> [px|ppt]
Sets the height of the container to _height_, specified in pixels or
percentage points. If the units are omitted, floating containers are
resized in px and tiled containers by ppt. If _height_ is 0, the container
- will not be resized.
+ will not be resized. For tiling containers, space is taken/given from all
+ other containers.
*resize* set [width] <width> [px|ppt]
Sets the width of the container to _width_, specified in pixels or
percentage points. If the units are omitted, floating containers are
resized in px and tiled containers by ppt. If _width_ is 0, the container
- will not be resized.
+ will not be resized. For tiling containers, space is taken/given from all
+ other containers.
*resize* set [width] <width> [px|ppt] [height] <height> [px|ppt]
Sets the width and height of the container to _width_ and _height_,
specified in pixels or percentage points. If the units are omitted,
floating containers are resized in px and tiled containers by ppt. If
_width_ or _height_ is 0, the container will not be resized on that axis.
+ For tiling containers, space is taken/given from all other containers.
*scratchpad* show
Shows a window from the scratchpad. Repeatedly using this command will
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-20 12:23:38 +0000