qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-31 00:30:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ui] Distribute remaining space over expand children

Browse source 
It's not perfect as the first N expanding children get grown by 1 pixel
regarless of weight, but it's much better than leaving a (possibly quite
large) gap at the edge of the layout.
This commit is contained in:
Bill Currie 2023-07-10 22:13:58 +09:00
parent c18e432e0f
commit 5ad6ec2757
1 changed files with 50 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

82
libs/ui/imui.c
View file

@ -519,40 +519,58 @@ calc_expansions (imui_ctx_t *ctx, hierarchy_t *h)
ecount.y++; ecount.y++;
} }
} }
// printf ("i:%d t:[%d %d] e:[%d %d] ec:[%d %d]\n", i, tlen.x, tlen.y, if (!ecount.x && !ecount.y) {
// elen.x, elen.y, ecount.x, ecount.y); continue;
for (uint32_t j = 0; ecount.x && j < h->childCount[i]; j++) {
uint32_t child = h->childIndex[i] + j;
if (cont[child].semantic_x != imui_size_expand) {
continue;
}
if (cont[i].vertical) {
len[child].x = len[i].x;
// printf ("xc:%d p:%d l:%d\n", child, len[i].x, len[child].x);
} else {
int space = len[i].x - tlen.x;
int *p = Ent_GetComponent (ent[child], c_percent_x, reg);
int delta = *p * space / elen.x;
len[child].x += max (delta, 0);
// printf ("xc:%d p:%d s:%d e:%d: l:%d\n", child, *p, space,
// elen.x, len[child].x);
}
} }
for (uint32_t j = 0; ecount.y && j < h->childCount[i]; j++) { if (cont[i].vertical) {
uint32_t child = h->childIndex[i] + j; int space = len[i].y - tlen.y;
if (cont[child].semantic_y != imui_size_expand) { int filled = 0;
continue; for (uint32_t j = 0; j < h->childCount[i]; j++) {
uint32_t child = h->childIndex[i] + j;
if (cont[child].semantic_x == imui_size_expand) {
len[child].x = len[i].x;
}
if (cont[child].semantic_y == imui_size_expand) {
int *p = Ent_GetComponent (ent[child], c_percent_y, reg);
int delta = *p * space / elen.y;
len[child].y += max (delta, 0);
filled += max (delta, 0);
}
} }
if (cont[i].vertical) { if (ecount.y && filled < space) {
int space = len[i].y - tlen.y; space -= filled;
int *p = Ent_GetComponent (ent[child], c_percent_y, reg); for (uint32_t j = 0; space && j < h->childCount[i]; j++) {
int delta = *p * space / elen.y; uint32_t child = h->childIndex[i] + j;
len[child].y += max (delta, 0); if (cont[child].semantic_y == imui_size_expand) {
// printf ("yc:%d p:%d s:%d e:%d: l:%d\n", child, *p, space, len[child].y++;
// elen.y, len[child].y); space--;
} else { }
len[child].y = len[i].y; }
// printf ("yc:%d p:%d l:%d\n", child, len[i].y, len[child].y); }
} else {
int space = len[i].x - tlen.x;
int filled = 0;
for (uint32_t j = 0; j < h->childCount[i]; j++) {
uint32_t child = h->childIndex[i] + j;
if (cont[child].semantic_x == imui_size_expand) {
int *p = Ent_GetComponent (ent[child], c_percent_x, reg);
int delta = *p * space / elen.x;
len[child].x += max (delta, 0);
filled += max (delta, 0);
}
if (cont[child].semantic_y == imui_size_expand) {
len[child].y = len[i].y;
}
}
if (ecount.x && filled < space) {
space -= filled;
for (uint32_t j = 0; space && j < h->childCount[i]; j++) {
uint32_t child = h->childIndex[i] + j;
if (cont[child].semantic_x == imui_size_expand) {
len[child].x++;
space--;
}
}
} }
} }
} }