mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-11 21:14:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement resize set <width> <height> for tiled containers

Browse Source 
Unlike i3, this implementation allows px measurements.

Also fixes a sane size check.
This commit is contained in:
Ryan Dwyer 2018-08-09 20:25:24 +10:00
parent 9395d3c93c
commit 6c730a2cb2
1 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sway/commands/resize.c
View File

@ -231,14 +231,14 @@ static void resize_tiled(int amount, enum resize_axis axis) {
double pixels = -amount / minor_weight; double pixels = -amount / minor_weight;
if (major_weight && (sibling_size + pixels / 2) < min_sane) { if (major_weight && (sibling_size + pixels / 2) < min_sane) {
return; // Too small return; // Too small
} else if ((sibling_size + pixels) < min_sane) { } else if (!major_weight && sibling_size + pixels < min_sane) {
return; // Too small return; // Too small
} }
} else if (sibling_pos > parent_pos && major_weight) { } else if (sibling_pos > parent_pos && major_weight) {
double pixels = -amount / major_weight; double pixels = -amount / major_weight;
if (minor_weight && (sibling_size + pixels / 2) < min_sane) { if (minor_weight && (sibling_size + pixels / 2) < min_sane) {
return; // Too small return; // Too small
} else if ((sibling_size + pixels) < min_sane) { } else if (!minor_weight && sibling_size + pixels < min_sane) {
return; // Too small return; // Too small
} }
} }
@ -407,8 +407,43 @@ static struct cmd_results *resize_adjust_tiled(enum resize_axis axis,
*/ */
static struct cmd_results *resize_set_tiled(struct sway_container *con, static struct cmd_results *resize_set_tiled(struct sway_container *con,
struct resize_amount *width, struct resize_amount *height) { struct resize_amount *width, struct resize_amount *height) {
return cmd_results_new(CMD_INVALID, "resize", if (width->amount) {
"'resize set' is not implemented for tiled views"); if (width->unit == RESIZE_UNIT_PPT ||
width->unit == RESIZE_UNIT_DEFAULT) {
// Convert to px
struct sway_container *parent = con->parent;
while (parent->type >= C_WORKSPACE && parent->layout != L_HORIZ) {
parent = parent->parent;
}
if (parent->type >= C_WORKSPACE) {
width->amount = parent->width * width->amount / 100;
width->unit = RESIZE_UNIT_PX;
}
}
if (width->unit == RESIZE_UNIT_PX) {
resize_tiled(width->amount - con->width, RESIZE_AXIS_HORIZONTAL);
}
}
if (height->amount) {
if (height->unit == RESIZE_UNIT_PPT ||
height->unit == RESIZE_UNIT_DEFAULT) {
// Convert to px
struct sway_container *parent = con->parent;
while (parent->type >= C_WORKSPACE && parent->layout != L_VERT) {
parent = parent->parent;
}
if (parent->type >= C_WORKSPACE) {
height->amount = parent->height * height->amount / 100;
height->unit = RESIZE_UNIT_PX;
}
}
if (height->unit == RESIZE_UNIT_PX) {
resize_tiled(height->amount - con->height, RESIZE_AXIS_VERTICAL);
}
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }
/** /**