From 9fc36d5db0aba398ad3c87f3931a5460d9881d57 Mon Sep 17 00:00:00 2001
From: dP <dp@dpointer.org>
Date: Tue, 19 May 2020 19:44:08 +0300
Subject: [PATCH] Fix tooltip width on empty station

---
 src/lang/english.txt | 2 +-
 src/misc_gui.cpp     | 5 ++++-
 src/rev.cpp          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/lang/english.txt b/src/lang/english.txt
index 20577fe87f..9d0d088c60 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -5438,7 +5438,7 @@ STR_TOWN_CB_CARGO_FROM_NOT                                      :{SILVER}{COMMA}
 STR_CONFIG_SETTING_POLYRAIL_DOUBLECLICK_TOOLTIPS                :Enable finishing polyrail with mouse double click{STRING2}
 
 #tooltips extra
-STR_CONFIG_SETTING_ENABLE_EXTRA_TOOLTIPS                        :Enable extra tooltips{STRING2}
+STR_CONFIG_SETTING_ENABLE_EXTRA_TOOLTIPS                        :Enable extra tooltips: {STRING2}
 STR_TTE_HOUSE_NAME                                              :{LTBLUE}{STRING}
 STR_TTE_HOUSE                                                   :{BLACK}Population: {NUM}
 STR_TTE_INDUSTRY_NAME                                           :{LTBLUE}{INDUSTRY}
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index c0576cf5fb..4e17b0789a 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -129,7 +129,7 @@ public:
 
 		if (!StrEmpty(this->landinfo_data[LAND_INFO_MULTICENTER_LINE])) {
 			uint width = GetStringBoundingBox(this->landinfo_data[LAND_INFO_MULTICENTER_LINE]).width + WD_FRAMETEXT_LEFT + WD_FRAMETEXT_RIGHT;
-			size->width = max(size->width, min(300u, width));
+			size->width = max(size->width, min<uint>(ScaleGUITrad(300), width));
 			SetDParamStr(0, this->landinfo_data[LAND_INFO_MULTICENTER_LINE]);
 			size->height += GetStringHeight(STR_JUST_RAW_STRING, size->width - WD_FRAMETEXT_LEFT - WD_FRAMETEXT_RIGHT);
 		}
@@ -1440,6 +1440,9 @@ struct TooltipsExtraWindow : public Window
 				const Station *st = Station::GetIfValid((StationID)this->objIndex);
 				if(st == NULL) break;
 
+				SetDParam(0, st->index);
+				size->width = max(GetStringBoundingBox(STR_TTE_STATION_NAME).width, size->width);
+
 				for (int i = 0; i < _sorted_standard_cargo_specs_size; i++) {
 					const CargoSpec *cs = _sorted_cargo_specs[i];
 					if(cs == NULL) continue;
diff --git a/src/rev.cpp b/src/rev.cpp
index a4094d00f6..ef7aafb70c 100644
--- a/src/rev.cpp
+++ b/src/rev.cpp
@@ -83,4 +83,4 @@ const byte _openttd_revision_tagged = 1;
 const uint32 _openttd_newgrf_version = 1 << 28 | 10 << 24 | 0 << 20 | 1 << 19 | 28004;
 
 
-const char _citymania_version[] = "20200519-master-m25fce2d061 19.05.20";
+const char _citymania_version[] = "20200519-master-m7b15d2a938 19.05.20";