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

Fix the resize algorithm I broke earlier. 

The reason it was broken was that it was ok for the sum of the
percentages to be something other than 1.0. Now this is no longer
the case, the sum of the percentages must always be 1.0 or an
assertion will fail when we render the containers.
This commit is contained in:
Fernando Tarlá Cardoso Lemos 2011-01-25 22:14:04 -02:00 committed by Michael Stapelberg
parent bc82fc7e9f
commit 568cafd4ec
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/resize.c
View File

@ -107,11 +107,14 @@ int resize_graphical_handler(Con *first, Con *second, orientation_t orientation,
DLOG("Done, pixels = %d\n", pixels); DLOG("Done, pixels = %d\n", pixels);
// if we got thus far, the containers must have
// percentages associated with them
assert(first->percent > 0.0);
assert(second->percent > 0.0);
// calculate the new percentage for the first container
double new_percent, difference; double new_percent, difference;
int children = con_num_children(first->parent); double percent = first->percent;
double percent = 1.0 / children;
if (first->percent > 0.0)
percent = first->percent;
DLOG("percent = %f\n", percent); DLOG("percent = %f\n", percent);
int original = (orientation == HORIZ ? first->rect.width : first->rect.height); int original = (orientation == HORIZ ? first->rect.width : first->rect.height);
DLOG("original = %d\n", original); DLOG("original = %d\n", original);
@ -119,15 +122,15 @@ int resize_graphical_handler(Con *first, Con *second, orientation_t orientation,
difference = percent - new_percent; difference = percent - new_percent;
DLOG("difference = %f\n", difference); DLOG("difference = %f\n", difference);
DLOG("new percent = %f\n", new_percent); DLOG("new percent = %f\n", new_percent);
first->percent = new_percent; first->percent = new_percent;
double s_percent = 1.0 / children; // calculate the new percentage for the second container
if (second->percent > 0.0) double s_percent = second->percent;
s_percent = second->percent;
second->percent = s_percent + difference; second->percent = s_percent + difference;
DLOG("second->percent = %f\n", second->percent); DLOG("second->percent = %f\n", second->percent);
// now we must make sure that the sum of the percentages remain 1.0
con_fix_percent(first->parent);
return 0; return 0;
} }