mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r26964) -Codechange: Allow editbox size to change.

This commit is contained in:
peter1138 2014-10-05 18:10:01 +00:00
parent 1ea237ff74
commit 9ab2263fda
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/widget.cpp
View File

@ -2138,12 +2138,9 @@ NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, int index, uint16 data,
this->SetFill(0, 0); this->SetFill(0, 0);
break; break;
case WWT_EDITBOX: { case WWT_EDITBOX:
Dimension sprite_size = GetSpriteSize(_current_text_dir == TD_RTL ? SPR_IMG_DELETE_RIGHT : SPR_IMG_DELETE_LEFT);
this->SetMinimalSize(30 + sprite_size.width, sprite_size.height);
this->SetFill(0, 0); this->SetFill(0, 0);
break; break;
}
case WWT_CAPTION: case WWT_CAPTION:
this->SetFill(1, 0); this->SetFill(1, 0);
@ -2285,9 +2282,12 @@ void NWidgetLeaf::SetupSmallestSize(Window *w, bool init_array)
size = maxdim(size, NWidgetLeaf::resizebox_dimension); size = maxdim(size, NWidgetLeaf::resizebox_dimension);
break; break;
} }
case WWT_EDITBOX: case WWT_EDITBOX: {
size.height = max(size.height, GetStringBoundingBox("_").height + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM); Dimension sprite_size = GetSpriteSize(_current_text_dir == TD_RTL ? SPR_IMG_DELETE_RIGHT : SPR_IMG_DELETE_LEFT);
size.width = 30 + sprite_size.width;
size.height = max(sprite_size.height, GetStringBoundingBox("_").height + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM);
/* FALL THROUGH */ /* FALL THROUGH */
}
case WWT_PUSHBTN: { case WWT_PUSHBTN: {
static const Dimension extra = {WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM}; static const Dimension extra = {WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM};
padding = &extra; padding = &extra;