Mercurial > hg > openttd

changeset 16290:3cb62dd5cf82 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r20997) -Fix: Size of sort buttons for order and vehicle list gui could be too small
author planetmaker <planetmaker@openttd.org>
date Tue, 19 Oct 2010 21:48:20 +0000
parents 75944252a49d
children 0b73411ad93a
files src/bridge_gui.cpp src/group_gui.cpp src/industry_gui.cpp src/station_gui.cpp src/town_gui.cpp src/vehicle_gui.cpp
diffstat 6 files changed, 20 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -169,7 +169,7 @@
 		switch (widget) {
 			case BBSW_DROPDOWN_ORDER: {
 				Dimension d = GetStringBoundingBox(this->GetWidget<NWidgetCore>(widget)->widget_data);
-				d.width += padding.width + WD_SORTBUTTON_ARROW_WIDTH * 2; // Doubled since the word is centered, also looks nice.
+				d.width += padding.width + WD_SORTBUTTON_ARROW_WIDTH * 2; // Doubled since the string is centred and it also looks better.
 				d.height += padding.height;
 				*size = maxdim(*size, d);
 				break;
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -231,6 +231,14 @@
 				size->width += WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT + 8 + 8;
 				break;
 
+			case GRP_WIDGET_SORT_BY_ORDER: {
+				Dimension d = GetStringBoundingBox(this->GetWidget<NWidgetCore>(widget)->widget_data);
+				d.width += padding.width + WD_SORTBUTTON_ARROW_WIDTH * 2; // Doubled since the string is centred and it also looks better.
+				d.height += padding.height;
+				*size = maxdim(*size, d);
+				break;
+			}
+
 			case GRP_WIDGET_LIST_VEHICLE:
 				resize->height = GetVehicleListHeight(this->vli.vtype, FONT_HEIGHT_NORMAL + WD_MATRIX_TOP);
 				size->height = 4 * resize->height;
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -1267,7 +1267,7 @@
 		switch (widget) {
 			case IDW_DROPDOWN_ORDER: {
 				Dimension d = GetStringBoundingBox(this->GetWidget<NWidgetCore>(widget)->widget_data);
-				d.width += padding.width + WD_SORTBUTTON_ARROW_WIDTH * 2; // Doubled since the word is centered, also looks nice.
+				d.width += padding.width + WD_SORTBUTTON_ARROW_WIDTH * 2; // Doubled since the string is centred and it also looks better.
 				d.height += padding.height;
 				*size = maxdim(*size, d);
 				break;
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -379,7 +379,7 @@
 		switch (widget) {
 			case SLW_SORTBY: {
 				Dimension d = GetStringBoundingBox(this->GetWidget<NWidgetCore>(widget)->widget_data);
-				d.width += padding.width + WD_SORTBUTTON_ARROW_WIDTH * 2; // Doubled since the word is centered, also looks nice.
+				d.width += padding.width + WD_SORTBUTTON_ARROW_WIDTH * 2; // Doubled since the string is centred and it also looks better.
 				d.height += padding.height;
 				*size = maxdim(*size, d);
 				break;
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -784,7 +784,7 @@
 			case TDW_SORTNAME:
 			case TDW_SORTPOPULATION: {
 				Dimension d = GetStringBoundingBox(this->GetWidget<NWidgetCore>(widget)->widget_data);
-				d.width += padding.width + WD_SORTBUTTON_ARROW_WIDTH * 2; // Doubled since the word is centered, also looks nice.
+				d.width += padding.width + WD_SORTBUTTON_ARROW_WIDTH * 2; // Doubled since the string is centred and it also looks better.
 				d.height += padding.height;
 				*size = maxdim(*size, d);
 				break;
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -1171,6 +1171,14 @@
 				}
 				break;
 
+			case VLW_WIDGET_SORT_ORDER: {
+				Dimension d = GetStringBoundingBox(this->GetWidget<NWidgetCore>(widget)->widget_data);
+				d.width += padding.width + WD_SORTBUTTON_ARROW_WIDTH * 2; // Doubled since the string is centred and it also looks better.
+				d.height += padding.height;
+				*size = maxdim(*size, d);
+				break;
+			}
+
 			case VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN: {
 				Dimension d = this->GetActionDropdownSize(this->vli.type == VL_STANDARD, false);
 				d.height += padding.height;