File diff r19845:1a7e8f4e03df → r19846:75a27628493b
src/genworld_gui.cpp
Show inline comments
 
@@ -440,52 +440,52 @@ struct GenerateLandscapeWindow : public 
 

	
 
	virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
 
	{
 
		const StringID *strs = NULL;
 
		switch (widget) {
 
			case WID_GL_START_DATE_TEXT:
 
				SetDParam(0, ConvertYMDToDate(MAX_YEAR, 0, 1));
 
				*size = GetStringBoundingBox(STR_BLACK_DATE_LONG);
 
				break;
 

	
 
			case WID_GL_MAPSIZE_X_PULLDOWN:
 
			case WID_GL_MAPSIZE_Y_PULLDOWN:
 
				SetDParam(0, MAX_MAP_SIZE);
 
				SetDParamMaxValue(0, MAX_MAP_SIZE);
 
				*size = GetStringBoundingBox(STR_JUST_INT);
 
				break;
 

	
 
			case WID_GL_SNOW_LEVEL_TEXT:
 
				SetDParam(0, MAX_TILE_HEIGHT);
 
				SetDParamMaxValue(0, MAX_TILE_HEIGHT);
 
				*size = GetStringBoundingBox(STR_JUST_INT);
 
				break;
 

	
 
			case WID_GL_HEIGHTMAP_SIZE_TEXT:
 
				SetDParam(0, this->x);
 
				SetDParam(1, this->y);
 
				*size = GetStringBoundingBox(STR_MAPGEN_HEIGHTMAP_SIZE);
 
				break;
 

	
 
			case WID_GL_TOWN_PULLDOWN:
 
				strs = _num_towns;
 
				SetDParam(0, CUSTOM_TOWN_MAX_NUMBER);
 
				SetDParamMaxValue(0, CUSTOM_TOWN_MAX_NUMBER);
 
				*size = GetStringBoundingBox(STR_NUM_CUSTOM_NUMBER);
 
				break;
 

	
 
			case WID_GL_INDUSTRY_PULLDOWN:   strs = _num_inds; break;
 
			case WID_GL_LANDSCAPE_PULLDOWN:  strs = _landscape; break;
 
			case WID_GL_TREE_PULLDOWN:       strs = _tree_placer; break;
 
			case WID_GL_TERRAIN_PULLDOWN:    strs = _elevations; break;
 
			case WID_GL_WATER_PULLDOWN:
 
				strs = _sea_lakes;
 
				SetDParam(0, CUSTOM_SEA_LEVEL_MAX_PERCENTAGE);
 
				SetDParamMaxValue(0, CUSTOM_SEA_LEVEL_MAX_PERCENTAGE);
 
				*size = GetStringBoundingBox(STR_SEA_LEVEL_CUSTOM_PERCENTAGE);
 
				break;
 

	
 
			case WID_GL_RIVER_PULLDOWN:      strs = _rivers; break;
 
			case WID_GL_SMOOTHNESS_PULLDOWN: strs = _smoothness; break;
 
			case WID_GL_VARIETY_PULLDOWN:    strs = _variety; break;
 
			case WID_GL_HEIGHTMAP_ROTATION_PULLDOWN: strs = _rotation; break;
 
			case WID_GL_BORDERS_RANDOM:
 
				*size = maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_RANDOMIZE), GetStringBoundingBox(STR_MAPGEN_BORDER_MANUAL));
 
				break;
 

	
 
			case WID_GL_WATER_NE:
 
@@ -914,29 +914,29 @@ struct CreateScenarioWindow : public Win
 

	
 
	virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
 
	{
 
		StringID str = STR_JUST_INT;
 
		switch (widget) {
 
			case WID_CS_START_DATE_TEXT:
 
				SetDParam(0, ConvertYMDToDate(MAX_YEAR, 0, 1));
 
				str = STR_BLACK_DATE_LONG;
 
				break;
 

	
 
			case WID_CS_MAPSIZE_X_PULLDOWN:
 
			case WID_CS_MAPSIZE_Y_PULLDOWN:
 
				SetDParam(0, MAX_MAP_SIZE);
 
				SetDParamMaxValue(0, MAX_MAP_SIZE);
 
				break;
 

	
 
			case WID_CS_FLAT_LAND_HEIGHT_TEXT:
 
				SetDParam(0, MAX_TILE_HEIGHT);
 
				SetDParamMaxValue(0, MAX_TILE_HEIGHT);
 
				break;
 

	
 
			default:
 
				return;
 
		}
 
		*size = GetStringBoundingBox(str);
 
		size->width += padding.width;
 
		size->height += padding.height;
 
	}
 

	
 
	virtual void OnClick(Point pt, int widget, int click_count)
 
	{
 
@@ -1185,25 +1185,25 @@ struct GenerateProgressWindow : public W
 
					STR_GENERATION_ABORT_MESSAGE,
 
					this,
 
					AbortGeneratingWorldCallback
 
				);
 
				break;
 
		}
 
	}
 

	
 
	virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
 
	{
 
		switch (widget) {
 
			case WID_GP_PROGRESS_BAR: {
 
				SetDParam(0, 100);
 
				SetDParamMaxValue(0, 100);
 
				*size = GetStringBoundingBox(STR_GENERATION_PROGRESS);
 
				/* We need some spacing for the 'border' */
 
				size->height += 8;
 
				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->height = FONT_HEIGHT_NORMAL * 2 + WD_PAR_VSEP_NORMAL;