koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3389 from orestisf1993/resize-ensure-1px

Browse Source 
Ensure containers have a size of at least 1px after resize
This commit is contained in:
Ingo Bürk
2018-09-06 08:41:00 +02:00
committed by GitHub
parent 9edb7c7a3b 23c1c13d34
commit cb6da7169a
3 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/commands.c
View File

@ -551,24 +551,25 @@ static bool cmd_resize_tiling_width_height(I3_CMD, Con *current, const char *dir
ppt = new_current_percent - current->percent;
}
subtract_percent = ppt / (children - 1);
if (ppt < 0.0 && new_current_percent < percent_for_1px(current)) {
yerror("Not resizing, container would end with less than 1px\n");
return false;
}
LOG("new_current_percent = %f\n", new_current_percent);
LOG("subtract_percent = %f\n", subtract_percent);
/* Ensure that the new percentages are positive. */
TAILQ_FOREACH(child, &(current->parent->nodes_head), nodes) {
if (child == current)
continue;
if (child->percent - subtract_percent <= 0.0) {
LOG("Not resizing, already at minimum size (child %p would end up with a size of %.f\n", child, child->percent - subtract_percent);
ysuccess(false);
return false;
if (subtract_percent >= 0.0) {
TAILQ_FOREACH(child, &(current->parent->nodes_head), nodes) {
if (child == current) {
continue;
}
if (child->percent - subtract_percent < percent_for_1px(child)) {
yerror("Not resizing, already at minimum size (child %p would end up with a size of %.f\n", child, child->percent - subtract_percent);
return false;
}
}
}
if (new_current_percent <= 0.0) {
LOG("Not resizing, already at minimum size\n");
ysuccess(false);
return false;
}
current->percent = new_current_percent;
LOG("current->percent after = %f\n", current->percent);