cpp/openttd-patchpack/source File Diff

File diff r24596:eddf98238034 → r24597:afde5721a3b6

src/genworld_gui.cpp

➞

Show inline comments

@@ @@ -510,13 +510,13 @@ struct GenerateLandscapeWindow : public @@
 		if (strs != nullptr) {
 			while (*strs != INVALID_STRING_ID) {
 				*size = maxdim(*size, GetStringBoundingBox(*strs++));
+			}
+		}
 		size->width += padding.width;
 		size->height = max(size->height, (uint)(FONT_HEIGHT_NORMAL + WD_DROPDOWNTEXT_TOP + WD_DROPDOWNTEXT_BOTTOM));
+		size->height = std::max(size->height, (uint)(FONT_HEIGHT_NORMAL + WD_DROPDOWNTEXT_TOP + WD_DROPDOWNTEXT_BOTTOM));
+	}
 	void DrawWidget(const Rect &r, int widget) const override
+	{
 		switch (widget) {
 			case WID_GL_HEIGHTMAP_NAME_TEXT: {
@@ @@ -1211,13 +1211,13 @@ struct GenerateProgressWindow : public W @@
 				size->width += 8;
 				break;
+			}
 			case WID_GP_PROGRESS_TEXT:
 				for (uint i = 0; i < GWP_CLASS_COUNT; i++) {
 					size->width = max(size->width, GetStringBoundingBox(_generation_class_table[i]).width);
+					size->width = std::max(size->width, GetStringBoundingBox(_generation_class_table[i]).width);
+				}
 				size->height = FONT_HEIGHT_NORMAL * 2 + WD_PAR_VSEP_NORMAL;
 				break;
+		}
+	}