Mercurial > hg > openttd

changeset 13576:7d9d6446b83f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r18099) -Codechange: scale the edit boxes to the fontsize
author rubidium <rubidium@openttd.org>
date Sun, 15 Nov 2009 15:37:37 +0000 (2009-11-15)
parents b229beb1618e
children 27dce4c65d7b
files src/misc_gui.cpp src/network/network_content_gui.cpp src/widget.cpp
diffstat 3 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -1871,10 +1871,6 @@
 				resize->width = 1;
 				break;
 
-			case SLWW_SAVE_OSK_TITLE:
-				size->height = FONT_HEIGHT_NORMAL + padding.height;
-				break;
-
 			case SLWW_BACKGROUND:
 				size->height = 2 * FONT_HEIGHT_NORMAL + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
 				break;
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -381,10 +381,6 @@
 				*size = maxdim(*size, GetStringBoundingBox(STR_CONTENT_FILTER_TITLE));
 				break;
 
-			case NCLWW_FILTER:
-				size->height = FONT_HEIGHT_NORMAL + padding.height;
-				break;
-
 			case NCLWW_TYPE: {
 				Dimension d = *size;
 				for (int i = CONTENT_TYPE_BEGIN; i < CONTENT_TYPE_END; i++) {
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -1772,8 +1772,10 @@
 			size = maxdim(size, NWidgetLeaf::resizebox_dimension);
 			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};
 			padding = &extra;
 			break;