Merge pull request #3390 from orestisf1993/resize-tile
resize set for tiling: default to px when not specified
This commit is contained in:
commit
9edb7c7a3b
|
@ -694,13 +694,15 @@ void cmd_resize_set(I3_CMD, long cwidth, const char *mode_width, long cheight, c
|
|||
continue;
|
||||
}
|
||||
|
||||
if (cwidth > 0 && mode_width) {
|
||||
if (cwidth > 0) {
|
||||
bool is_ppt = mode_width && strcmp(mode_width, "ppt") == 0;
|
||||
success &= resize_set_tiling(current_match, cmd_output, current->con,
|
||||
HORIZ, strcmp(mode_width, "ppt") == 0, cwidth);
|
||||
HORIZ, is_ppt, cwidth);
|
||||
}
|
||||
if (cheight > 0 && mode_height) {
|
||||
if (cheight > 0) {
|
||||
bool is_ppt = mode_height && strcmp(mode_height, "ppt") == 0;
|
||||
success &= resize_set_tiling(current_match, cmd_output, current->con,
|
||||
VERT, strcmp(mode_height, "ppt") == 0, cheight);
|
||||
VERT, is_ppt, cheight);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -124,6 +124,14 @@ cmd 'resize set 155 px 135 px';
|
|||
cmp_float($nodes->[1]->{nodes}->[1]->{rect}->{width}, 155, 'bottom-right window got 155 px width');
|
||||
cmp_float($nodes->[1]->{nodes}->[1]->{rect}->{height}, 135, 'bottom-right window got 135 px height');
|
||||
|
||||
# Without specifying mode
|
||||
cmd 'resize set 201 131';
|
||||
|
||||
($nodes, $focus) = get_ws_content($tmp);
|
||||
|
||||
cmp_float($nodes->[1]->{nodes}->[1]->{rect}->{width}, 201, 'bottom-right window got 201 px width');
|
||||
cmp_float($nodes->[1]->{nodes}->[1]->{rect}->{height}, 131, 'bottom-right window got 131 px height');
|
||||
|
||||
# Mix ppt and px
|
||||
cmd 'resize set 75 ppt 200 px';
|
||||
|
||||
|
|
Loading…
Reference in New Issue