diff options
| author | peter1138 <peter1138@openttd.org> | 2014-10-05 18:10:01 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2014-10-05 18:10:01 +0000 |
| commit | 9ab2263fda4bda2477ed6bf69ed26e03bb989155 (patch) | |
| tree | 7c97aad15e36c51d29195f51d4cc26b4f2695257 /src/widget.cpp | |
| parent | 1ea237ff745ea8c4ef8b8563c0887c280471399a (diff) | |
| download | openttd-9ab2263fda4bda2477ed6bf69ed26e03bb989155.tar.xz | |
(svn r26964) -Codechange: Allow editbox size to change.
Diffstat (limited to 'src/widget.cpp')
| -rw-r--r-- | src/widget.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/widget.cpp b/src/widget.cpp index 5556756bb..ab8374646 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -2138,12 +2138,9 @@ NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, int index, uint16 data, this->SetFill(0, 0); break; - 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); + case WWT_EDITBOX: this->SetFill(0, 0); break; - } case WWT_CAPTION: this->SetFill(1, 0); @@ -2285,9 +2282,12 @@ void NWidgetLeaf::SetupSmallestSize(Window *w, bool init_array) size = maxdim(size, NWidgetLeaf::resizebox_dimension); break; } - case WWT_EDITBOX: - size.height = max(size.height, GetStringBoundingBox("_").height + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM); + case WWT_EDITBOX: { + 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 */ + } case WWT_PUSHBTN: { static const Dimension extra = {WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM}; padding = &extra; |