alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2805 from RyanDwyer/fix-resize-return-value

Browse source 
resize: Determine if anything changed using before/after check
This commit is contained in:
Drew DeVault 2018-10-09 15:42:43 +02:00 committed by GitHub
parent 53164c4aa2 61699a1146
commit 43875c437b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/commands.h
View file

@ -95,7 +95,7 @@ struct cmd_results *add_color(const char *name,
/** /**
* TODO: Move this function and its dependent functions to container.c. * TODO: Move this function and its dependent functions to container.c.
*/ */
bool container_resize_tiled(struct sway_container *parent, enum wlr_edges edge, void container_resize_tiled(struct sway_container *parent, enum wlr_edges edge,
int amount); int amount);
sway_cmd cmd_assign; sway_cmd cmd_assign;

26
sway/commands/resize.c
View file

@ -179,11 +179,11 @@ static void container_recursive_resize(struct sway_container *container,
} }
} }
static bool resize_tiled(struct sway_container *parent, int amount, static void resize_tiled(struct sway_container *parent, int amount,
enum resize_axis axis) { enum resize_axis axis) {
struct sway_container *focused = parent; struct sway_container *focused = parent;
if (!parent) { if (!parent) {
return false; return;
} }
enum sway_container_layout parallel_layout = enum sway_container_layout parallel_layout =
@ -216,7 +216,7 @@ static bool resize_tiled(struct sway_container *parent, int amount,
} }
if (!parent) { if (!parent) {
// Can't resize in this direction // Can't resize in this direction
return false; return;
} }
// Implement up/down/left/right direction by zeroing one of the weights, // Implement up/down/left/right direction by zeroing one of the weights,
@ -248,22 +248,22 @@ static bool resize_tiled(struct sway_container *parent, int amount,
if (sibling_pos < parent_pos && minor_weight) { if (sibling_pos < parent_pos && minor_weight) {
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 false; // Too small return; // Too small
} else if (!major_weight && sibling_size + pixels < min_sane) { } else if (!major_weight && sibling_size + pixels < min_sane) {
return false; // 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 false; // Too small return; // Too small
} else if (!minor_weight && sibling_size + pixels < min_sane) { } else if (!minor_weight && sibling_size + pixels < min_sane) {
return false; // Too small return; // Too small
} }
} }
} else { } else {
double pixels = amount; double pixels = amount;
if (parent_size + pixels < min_sane) { if (parent_size + pixels < min_sane) {
return false; // Too small return; // Too small
} }
} }
} }
@ -317,10 +317,9 @@ static bool resize_tiled(struct sway_container *parent, int amount,
} else { } else {
arrange_workspace(parent->workspace); arrange_workspace(parent->workspace);
} }
return true;
} }
bool container_resize_tiled(struct sway_container *parent, void container_resize_tiled(struct sway_container *parent,
enum wlr_edges edge, int amount) { enum wlr_edges edge, int amount) {
enum resize_axis axis = RESIZE_AXIS_INVALID; enum resize_axis axis = RESIZE_AXIS_INVALID;
switch (edge) { switch (edge) {
@ -339,7 +338,7 @@ bool container_resize_tiled(struct sway_container *parent,
case WLR_EDGE_NONE: case WLR_EDGE_NONE:
break; break;
} }
return resize_tiled(parent, amount, axis); resize_tiled(parent, amount, axis);
} }
/** /**
@ -447,7 +446,10 @@ static struct cmd_results *resize_adjust_tiled(enum resize_axis axis,
} }
} }
if (!resize_tiled(current, amount->amount, axis)) { double old_width = current->width;
double old_height = current->height;
resize_tiled(current, amount->amount, axis);
if (current->width == old_width && current->height == old_height) {
return cmd_results_new(CMD_INVALID, "resize", return cmd_results_new(CMD_INVALID, "resize",
"Cannot resize any further"); "Cannot resize any further");
} }