hmn
/
orca
5
Fork 2
Code Issues 21 Pull Requests 1 Packages Projects Releases Wiki Activity

[ui layout] implement ui box min size, + small fixes in layout code of ui sample

This commit is contained in:
Martin Fouilleul 2023-09-15 12:41:23 +02:00
parent ae392a1fc2
commit 6a50a6bbdc
6 changed files with 1366 additions and 992 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1156
samples/ui/src/main.c
View File

File diff suppressed because it is too large Load Diff

BIN
sketches/ui/OpenSans-Bold.ttf Normal file
View File

Binary file not shown.

BIN
sketches/ui/OpenSans-Regular.ttf Normal file
View File

Binary file not shown.

1191
sketches/ui/main.c
View File

File diff suppressed because it is too large Load Diff

10
src/ui/ui.c
View File

@ -1083,11 +1083,11 @@ void oc_ui_layout_upward_dependent_size(oc_ui_context* ui, oc_ui_box* box, int a
oc_ui_size* size = &child->style.size.c[axis]; oc_ui_size* size = &child->style.size.c[axis];
if(size->kind == OC_UI_SIZE_PARENT) if(size->kind == OC_UI_SIZE_PARENT)
{ {
child->rect.c[2 + axis] = availableSize * size->value; child->rect.c[2 + axis] = oc_max(size->minSize, availableSize * size->value);
} }
else if(size->kind == OC_UI_SIZE_PARENT_MINUS_PIXELS) else if(size->kind == OC_UI_SIZE_PARENT_MINUS_PIXELS)
{ {
child->rect.c[2 + axis] = oc_max(0, availableSize - size->value); child->rect.c[2 + axis] = oc_max(size->minSize, oc_max(0, availableSize - size->value));
} }
} }
@ -1122,7 +1122,11 @@ void oc_ui_layout_upward_dependent_size(oc_ui_context* ui, oc_ui_box* box, int a
oc_list_for(box->children, child, oc_ui_box, listElt) oc_list_for(box->children, child, oc_ui_box, listElt)
{ {
f32 relax = child->style.size.c[axis].relax; f32 relax = child->style.size.c[axis].relax;
child->rect.c[2 + axis] -= alpha * child->rect.c[2 + axis] * relax; f32 minSize = child->style.size.c[axis].minSize;
f32 remove = alpha * child->rect.c[2 + axis] * relax;
child->rect.c[2 + axis] = oc_max(minSize, child->rect.c[2 + axis] - remove);
sum += child->rect.c[2 + axis]; sum += child->rect.c[2 + axis];
} }
} }

1
src/ui/ui.h
View File

@ -82,6 +82,7 @@ typedef struct oc_ui_size
oc_ui_size_kind kind; oc_ui_size_kind kind;
f32 value; f32 value;
f32 relax; f32 relax;
f32 minSize;
} oc_ui_size; } oc_ui_size;
typedef union oc_ui_box_size typedef union oc_ui_box_size