Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug in the resize asserts; fix another bug in the hBox implementation causing sizing and positioning of child widgets to fail. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5423 4a71c877-e1ca-e34f-864e-861f7616d084
master
Freddie Witherden 2008-07-08 16:46:53 +00:00
parent 22d4eb3fe1
commit f99660d986
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/betawidget/hBox.c
View File

@ -165,8 +165,8 @@ bool hBoxDoLayoutImpl(widget *self)
sizeInfo *childSize = &childSizeInfo[i]; sizeInfo *childSize = &childSizeInfo[i];
// Set the size and offset // Set the size and offset
widgetResize(child, childSizeInfo->currentSize.x, widgetResize(child, childSize->currentSize.x,
childSizeInfo->currentSize.y); childSize->currentSize.y);
child->offset.x = temp; child->offset.x = temp;
child->offset.y = childSize->offset.y; child->offset.y = childSize->offset.y;

8
lib/betawidget/widget.c
View File

@ -575,10 +575,10 @@ void widgetResizeImpl(widget *self, int w, int h)
const size minSize = widgetGetMinSize(self); const size minSize = widgetGetMinSize(self);
const size maxSize = widgetGetMaxSize(self); const size maxSize = widgetGetMaxSize(self);
assert(minSize.x < w); assert(minSize.x <= w);
assert(minSize.y < h); assert(minSize.y <= h);
assert(w < maxSize.x); assert(w <= maxSize.x);
assert(h < maxSize.y); assert(h <= maxSize.y);
self->size.x = w; self->size.x = w;
self->size.y = h; self->size.y = h;