Browse Source

oui: incorporating the last items margin when computing size

pull/1/head
Leonard Ritter 11 years ago
parent
commit
7bdba3d11d
1 changed files with 3 additions and 5 deletions
  1. +3
    -5
      oui.h

+ 3
- 5
oui.h View File

@@ -843,16 +843,15 @@ int uiGetRelToDown(int item) {
UI_INLINE int uiComputeChainSize(UIitem *pkid, int dim) {
UIitem *pitem = pkid;
int wdim = dim+2;
int size = pitem->rect.v[wdim];
int size = pitem->rect.v[wdim] + pitem->margins[dim] + pitem->margins[wdim];
int it = 0;
pitem->visited |= 1<<dim;
// traverse along left neighbors
while ((pitem->layout_flags>>dim) & UI_LEFT) {
size += pitem->margins[dim];
if (pitem->relto[dim] < 0) break;
pitem = uiItemPtr(pitem->relto[dim]);
pitem->visited |= 1<<dim;
size += pitem->rect.v[wdim];
size += pitem->rect.v[wdim] + pitem->margins[dim] + pitem->margins[wdim];
it++;
assert(it<1000000); // infinite loop
}
@@ -860,11 +859,10 @@ UI_INLINE int uiComputeChainSize(UIitem *pkid, int dim) {
pitem = pkid;
it = 0;
while ((pitem->layout_flags>>dim) & UI_RIGHT) {
size += pitem->margins[wdim];
if (pitem->relto[wdim] < 0) break;
pitem = uiItemPtr(pitem->relto[wdim]);
pitem->visited |= 1<<dim;
size += pitem->rect.v[wdim];
size += pitem->rect.v[wdim] + pitem->margins[dim] + pitem->margins[wdim];
it++;
assert(it<1000000); // infinite loop
}


Loading…
Cancel
Save