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

cmd_resize: allow resizing hidden scratchpad by px

Browse Source 
Allow resizing a hidden scratchpad container by px. Resizing a hidden
scratchpad container by ppt is still not allowed since there is no
workspace
This commit is contained in:
Brian Ashworth 2019-01-16 01:05:10 -05:00 committed by emersion
parent 638b04b3e0
commit 81e595e6e8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sway/commands/resize.c
View File

@ -387,6 +387,10 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
if (width->amount) { if (width->amount) {
switch (width->unit) { switch (width->unit) {
case RESIZE_UNIT_PPT: case RESIZE_UNIT_PPT:
if (con->scratchpad && !con->workspace) {
return cmd_results_new(CMD_FAILURE,
"Cannot resize a hidden scratchpad container by ppt");
}
// Convert to px // Convert to px
width->amount = con->workspace->width * width->amount / 100; width->amount = con->workspace->width * width->amount / 100;
width->unit = RESIZE_UNIT_PX; width->unit = RESIZE_UNIT_PX;
@ -407,6 +411,10 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
if (height->amount) { if (height->amount) {
switch (height->unit) { switch (height->unit) {
case RESIZE_UNIT_PPT: case RESIZE_UNIT_PPT:
if (con->scratchpad && !con->workspace) {
return cmd_results_new(CMD_FAILURE,
"Cannot resize a hidden scratchpad container by ppt");
}
// Convert to px // Convert to px
height->amount = con->workspace->height * height->amount / 100; height->amount = con->workspace->height * height->amount / 100;
height->unit = RESIZE_UNIT_PX; height->unit = RESIZE_UNIT_PX;
@ -589,11 +597,6 @@ struct cmd_results *cmd_resize(int argc, char **argv) {
if (!current) { if (!current) {
return cmd_results_new(CMD_INVALID, "Cannot resize nothing"); return cmd_results_new(CMD_INVALID, "Cannot resize nothing");
} }
if (current->scratchpad && !current->workspace) {
return cmd_results_new(CMD_FAILURE,
"Cannot resize a hidden scratchpad container");
}
struct cmd_results *error; struct cmd_results *error;
if ((error = checkarg(argc, "resize", EXPECTED_AT_LEAST, 2))) { if ((error = checkarg(argc, "resize", EXPECTED_AT_LEAST, 2))) {