nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2036 from Airblader/bug-2015 

Make resize grow|shrink width|height work for a nested split in the s…
This commit is contained in:
Michael Stapelberg 2015-10-26 09:14:28 +01:00
parent d35ee4501b 10b1b39478
commit 30c3729a24
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands.c
View File

@ -615,7 +615,7 @@ static bool cmd_resize_tiling_width_height(I3_CMD, Con *current, const char *way
while (current->type != CT_WORKSPACE &&
current->type != CT_FLOATING_CON &&
con_orientation(current->parent) != search_orientation)
(con_orientation(current->parent) != search_orientation || con_num_children(current->parent) == 1))
current = current->parent;
/* get the default percentage */

15
testcases/t/141-resize.t
View File

@ -141,6 +141,21 @@ cmp_float($nodes->[1]->{percent}, 0.166666666666667, 'second window got 16%');
cmp_float($nodes->[2]->{percent}, 0.166666666666667, 'third window got 16%');
cmp_float($nodes->[3]->{percent}, 0.50, 'fourth window got 50%');
################################################################################
# Check that the resize grow/shrink width/height syntax works if a nested split
# was set on the container, but no sibling has been opened yet. See #2015.
################################################################################
$tmp = fresh_workspace;
$left = open_window;
$right = open_window;
cmd 'split h';
cmd 'resize grow width 10px or 25 ppt';
($nodes, $focus) = get_ws_content($tmp);
cmp_float($nodes->[0]->{percent}, 0.25, 'left window got 25%');
cmp_float($nodes->[1]->{percent}, 0.75, 'right window got 75%');
############################################################
# checks that resizing floating windows works