update to 1.5.2

--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2015-09-01 22:52:41 +03:00
parent 641df04e75
commit 48992033ed
87 changed files with 1446 additions and 847 deletions

View File

@@ -1,4 +1,4 @@
/* $Id: widget.cpp 27272 2015-05-08 17:32:57Z frosch $ */
/* $Id: widget.cpp 27348 2015-07-30 18:45:29Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -2284,7 +2284,7 @@ void NWidgetLeaf::SetupSmallestSize(Window *w, bool init_array)
}
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.width = max(size.width, 30 + sprite_size.width);
size.height = max(sprite_size.height, GetStringBoundingBox("_").height + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM);
/* FALL THROUGH */
}