mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26854) -Codechange: Don't override computed minimal size with static minimal size, instead only increase it.

release/1.5
peter1138 2014-09-20 00:27:14 +00:00
parent 79ca66eb67
commit 41054e73fd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/widget.cpp
View File

@ -805,8 +805,8 @@ NWidgetResizeBase::NWidgetResizeBase(WidgetType tp, uint fill_x, uint fill_y) :
*/ */
void NWidgetResizeBase::SetMinimalSize(uint min_x, uint min_y) void NWidgetResizeBase::SetMinimalSize(uint min_x, uint min_y)
{ {
this->min_x = min_x; this->min_x = max(this->min_x, min_x);
this->min_y = min_y; this->min_y = max(this->min_y, min_y);
} }
/** /**
@ -2100,7 +2100,8 @@ NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, int index, uint16 data,
{ {
assert(index >= 0 || tp == WWT_LABEL || tp == WWT_TEXT || tp == WWT_CAPTION || tp == WWT_RESIZEBOX || tp == WWT_SHADEBOX || tp == WWT_DEFSIZEBOX || tp == WWT_DEBUGBOX || tp == WWT_STICKYBOX || tp == WWT_CLOSEBOX); assert(index >= 0 || tp == WWT_LABEL || tp == WWT_TEXT || tp == WWT_CAPTION || tp == WWT_RESIZEBOX || tp == WWT_SHADEBOX || tp == WWT_DEFSIZEBOX || tp == WWT_DEBUGBOX || tp == WWT_STICKYBOX || tp == WWT_CLOSEBOX);
if (index >= 0) this->SetIndex(index); if (index >= 0) this->SetIndex(index);
this->SetMinimalSize(0, 0); this->min_x = 0;
this->min_y = 0;
this->SetResize(0, 0); this->SetResize(0, 0);
switch (tp) { switch (tp) {