gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-01 11:59:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r18099) -Codechange: scale the edit boxes to the fontsize

Browse Source
This commit is contained in:
rubidium 2009-11-15 15:37:37 +00:00
parent 36e030c19d
commit cddc057a60
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc_gui.cpp
View File

@ -1871,10 +1871,6 @@ public:
resize->width = 1; resize->width = 1;
break; break;
case SLWW_SAVE_OSK_TITLE:
size->height = FONT_HEIGHT_NORMAL + padding.height;
break;
case SLWW_BACKGROUND: case SLWW_BACKGROUND:
size->height = 2 * FONT_HEIGHT_NORMAL + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM; size->height = 2 * FONT_HEIGHT_NORMAL + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
break; break;

4
src/network/network_content_gui.cpp
View File

@ -381,10 +381,6 @@ public:
*size = maxdim(*size, GetStringBoundingBox(STR_CONTENT_FILTER_TITLE)); *size = maxdim(*size, GetStringBoundingBox(STR_CONTENT_FILTER_TITLE));
break; break;
case NCLWW_FILTER:
size->height = FONT_HEIGHT_NORMAL + padding.height;
break;
case NCLWW_TYPE: { case NCLWW_TYPE: {
Dimension d = *size; Dimension d = *size;
for (int i = CONTENT_TYPE_BEGIN; i < CONTENT_TYPE_END; i++) { for (int i = CONTENT_TYPE_BEGIN; i < CONTENT_TYPE_END; i++) {

6
src/widget.cpp
View File

@ -1772,8 +1772,10 @@ void NWidgetLeaf::SetupSmallestSize(Window *w, bool init_array)
size = maxdim(size, NWidgetLeaf::resizebox_dimension); size = maxdim(size, NWidgetLeaf::resizebox_dimension);
break; break;
} }
case WWT_PUSHBTN: case WWT_EDITBOX:
case WWT_EDITBOX: { size.height = max(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}; static const Dimension extra = {WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM};
padding = &extra; padding = &extra;
break; break;