mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-19 06:59:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Introduce container_is_scratchpad_hidden

Browse source 
Just a convenience function that improves readability of the code.

Other things worth noting:

* container_get_siblings and container_sibling_index no longer use the
const keyword
* container_handle_fullscreen_reparent is only ever called after
attaching the container to a workspace, so its con->workspace check has
been changed to an assertion
This commit is contained in:
Ryan Dwyer 2019-01-28 19:06:42 +10:00 • committed by emersion
parent 68a28e482f
commit 6b8bf10941
12 changed files with 35 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sway/commands/resize.c
View file

@ -86,7 +86,8 @@ static void calculate_constraints(int *min_width, int *max_width,
*min_height = config->floating_minimum_height;
}
if (config->floating_maximum_width == -1 || !con->workspace) { // no max
if (config->floating_maximum_width == -1 ||
container_is_scratchpad_hidden(con)) { // no max
*max_width = INT_MAX;
} else if (config->floating_maximum_width == 0) { // automatic
*max_width = con->workspace->width;
@ -94,7 +95,8 @@ static void calculate_constraints(int *min_width, int *max_width,
*max_width = config->floating_maximum_width;
}
if (config->floating_maximum_height == -1 || !con->workspace) { // no max
if (config->floating_maximum_height == -1 ||
container_is_scratchpad_hidden(con)) { // no max
*max_height = INT_MAX;
} else if (config->floating_maximum_height == 0) { // automatic
*max_height = con->workspace->height;
@ -386,7 +388,7 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
if (width->amount) {
switch (width->unit) {
case RESIZE_UNIT_PPT:
if (con->scratchpad && !con->workspace) {
if (container_is_scratchpad_hidden(con)) {
return cmd_results_new(CMD_FAILURE,
"Cannot resize a hidden scratchpad container by ppt");
}
@ -410,7 +412,7 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
if (height->amount) {
switch (height->unit) {
case RESIZE_UNIT_PPT:
if (con->scratchpad && !con->workspace) {
if (container_is_scratchpad_hidden(con)) {
return cmd_results_new(CMD_FAILURE,
"Cannot resize a hidden scratchpad container by ppt");
}