Leonard Ritter
10 years ago
2 changed files with 2 additions and 2 deletions
Unified View
Diff Options
-
+1 -1example.cpp
-
+1 -1oui.h
+ 1
- 1
example.cpp
View File
| @@ -805,7 +805,7 @@ void build_rowdemo(int parent) { | |||||
| demorect(box, "Layout( UI_DOWN )", 0.25f, 0, UI_DOWN, T, T, 0, 0, M, M); | demorect(box, "Layout( UI_DOWN )", 0.25f, 0, UI_DOWN, T, T, 0, 0, M, M); | ||||
| } | } | ||||
| { | { | ||||
| int box = demorect(parent, "Box( UI_ROW )\nLayout( UI_FILL )", 0.6f, UI_ROW, UI_FILL, 0, S, M, 0, M, M); | |||||
| int box = demorect(parent, "Box( UI_ROW | UI_JUSTIFY )\nLayout( UI_FILL )", 0.6f, UI_ROW|UI_JUSTIFY, UI_FILL, 0, S, M, 0, M, M); | |||||
| demorect(box, "Layout( UI_TOP )", 0.05f, 0, UI_TOP, T, T, M, M, M, 0); | demorect(box, "Layout( UI_TOP )", 0.05f, 0, UI_TOP, T, T, M, M, M, 0); | ||||
| demorect(box, "Layout( UI_VCENTER )", 0.1f, 0, UI_VCENTER, T, T, 0, 0, M, 0); | demorect(box, "Layout( UI_VCENTER )", 0.1f, 0, UI_VCENTER, T, T, 0, 0, M, 0); | ||||
+ 1
- 1
oui.h
View File
| @@ -1164,7 +1164,6 @@ UI_INLINE void uiArrangeStacked(UIitem *pitem, int dim, bool wrap) { | |||||
| while (kid >= 0) { | while (kid >= 0) { | ||||
| UIitem *pkid = uiItemPtr(kid); | UIitem *pkid = uiItemPtr(kid); | ||||
| int flags = (pkid->flags & UI_ITEM_LAYOUT_MASK) >> dim; | int flags = (pkid->flags & UI_ITEM_LAYOUT_MASK) >> dim; | ||||
| total++; | |||||
| short extend = used; | short extend = used; | ||||
| if ((flags & UI_HFILL) == UI_HFILL) { // grow | if ((flags & UI_HFILL) == UI_HFILL) { // grow | ||||
| count++; | count++; | ||||
| @@ -1181,6 +1180,7 @@ UI_INLINE void uiArrangeStacked(UIitem *pitem, int dim, bool wrap) { | |||||
| used = extend; | used = extend; | ||||
| kid = uiNextSibling(kid); | kid = uiNextSibling(kid); | ||||
| } | } | ||||
| total++; | |||||
| } | } | ||||
| int extra_space = ui_max(space - used,0); | int extra_space = ui_max(space - used,0); | ||||