Changeset - r27520:37b5f4ae518d
Parent rev.
Child rev.
[Not reviewed]
master
0 5 0
Patric Stout - 12 months ago 2023-06-05 08:27:04
truebrain@openttd.org
Fix: when syncing width of GUI items, take padding into account (#10915)
5 files changed with 19 insertions and 17 deletions:
src/company_gui.cpp
15
13
src/genworld_gui.cpp
1
1
src/newgrf_gui.cpp
1
1
src/settings_gui.cpp
1
1
src/town_gui.cpp
1
1
0 comments (0 inline, 0 general)
src/company_gui.cpp
➞
Show inline comments
 
@@ -1922,17 +1922,17 @@ struct CompanyInfrastructureWindow : Win
 
			case WID_CI_RAIL_DESC: {
 
				uint lines = 1; // Starts at 1 because a line is also required for the section title
 

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT).width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT).width + padding.width);

			




	
	
	
		
 

			




	
	
	
		
 
				for (const auto &rt : _sorted_railtypes) {

			




	
	
	
		
 
					if (HasBit(this->railtypes, rt)) {

			




	
	
	
		
 
						lines++;

			




	
	
	
		
 
						size->width = std::max(size->width, GetStringBoundingBox(GetRailTypeInfo(rt)->strings.name).width + WidgetDimensions::scaled.hsep_indent);

			




	
	
	
		
 
						size->width = std::max(size->width, GetStringBoundingBox(GetRailTypeInfo(rt)->strings.name).width + padding.width + WidgetDimensions::scaled.hsep_indent);

			




	
	
	
		
 
					}

			




	
	
	
		
 
				}

			




	
	
	
		
 
				if (this->railtypes != RAILTYPES_NONE) {

			




	
	
	
		
 
					lines++;

			




	
	
	
		
 
					size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS).width + WidgetDimensions::scaled.hsep_indent);

			




	
	
	
		
 
					size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS).width + padding.width + WidgetDimensions::scaled.hsep_indent);

			




	
	
	
		
 
				}

			




	
	
	
		
 

			




	
	
	
		
 
				size->height = std::max(size->height, lines * FONT_HEIGHT_NORMAL);

			




	
	
		
 
@@ -1943,12 +1943,12 @@ struct CompanyInfrastructureWindow : Win

			




	
	
	
		
 
			case WID_CI_TRAM_DESC: {

			




	
	
	
		
 
				uint lines = 1; // Starts at 1 because a line is also required for the section title

			




	
	
	
		
 

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(widget == WID_CI_ROAD_DESC ? STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT : STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT).width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(widget == WID_CI_ROAD_DESC ? STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT : STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT).width + padding.width);

			




	
	
	
		
 

			




	
	
	
		
 
				for (const auto &rt : _sorted_roadtypes) {

			




	
	
	
		
 
					if (HasBit(this->roadtypes, rt) && RoadTypeIsRoad(rt) == (widget == WID_CI_ROAD_DESC)) {

			




	
	
	
		
 
						lines++;

			




	
	
	
		
 
						size->width = std::max(size->width, GetStringBoundingBox(GetRoadTypeInfo(rt)->strings.name).width + WidgetDimensions::scaled.hsep_indent);

			




	
	
	
		
 
						size->width = std::max(size->width, GetStringBoundingBox(GetRoadTypeInfo(rt)->strings.name).width + padding.width + WidgetDimensions::scaled.hsep_indent);

			




	
	
	
		
 
					}

			




	
	
	
		
 
				}

			




	
	
	
		
 

			




	
	
		
 
@@ -1957,14 +1957,14 @@ struct CompanyInfrastructureWindow : Win

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_CI_WATER_DESC:

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT).width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS).width + WidgetDimensions::scaled.hsep_indent);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT).width + padding.width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS).width + padding.width + WidgetDimensions::scaled.hsep_indent);

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_CI_STATION_DESC:

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT).width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS).width + WidgetDimensions::scaled.hsep_indent);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS).width + WidgetDimensions::scaled.hsep_indent);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT).width + padding.width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS).width + padding.width + WidgetDimensions::scaled.hsep_indent);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS).width + padding.width + WidgetDimensions::scaled.hsep_indent);

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_CI_RAIL_COUNT:

			




	
	
		
 
@@ -2378,18 +2378,19 @@ struct CompanyWindow : Window

			




	
	
	
		
 
			case WID_C_DESC_VEHICLE_COUNTS:

			




	
	
	
		
 
				SetDParamMaxValue(0, 5000); // Maximum number of vehicles

			




	
	
	
		
 
				for (uint i = 0; i < lengthof(_company_view_vehicle_count_strings); i++) {

			




	
	
	
		
 
					size->width = std::max(size->width, GetStringBoundingBox(_company_view_vehicle_count_strings[i]).width);

			




	
	
	
		
 
					size->width = std::max(size->width, GetStringBoundingBox(_company_view_vehicle_count_strings[i]).width + padding.width);

			




	
	
	
		
 
				}

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_C_DESC_INFRASTRUCTURE_COUNTS:

			




	
	
	
		
 
				SetDParamMaxValue(0, UINT_MAX);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL).width);

			




	
	
	
		
 
				size->width = GetStringBoundingBox(STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL).width;

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD).width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_VIEW_INFRASTRUCTURE_WATER).width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_VIEW_INFRASTRUCTURE_STATION).width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT).width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_VIEW_INFRASTRUCTURE_NONE).width);

			




	
	
	
		
 
				size->width += padding.width;

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_C_VIEW_HQ:

			




	
	
		
 
@@ -2399,13 +2400,14 @@ struct CompanyWindow : Window

			




	
	
	
		
 
			case WID_C_GIVE_MONEY:

			




	
	
	
		
 
			case WID_C_COMPANY_PASSWORD:

			




	
	
	
		
 
			case WID_C_COMPANY_JOIN:

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_VIEW_VIEW_HQ_BUTTON).width);

			




	
	
	
		
 
				size->width = GetStringBoundingBox(STR_COMPANY_VIEW_VIEW_HQ_BUTTON).width;

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_VIEW_BUILD_HQ_BUTTON).width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_VIEW_RELOCATE_HQ).width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON).width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_VIEW_GIVE_MONEY_BUTTON).width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_VIEW_PASSWORD).width);

			




	
	
	
		
 
				size->width = std::max(size->width, GetStringBoundingBox(STR_COMPANY_VIEW_JOIN).width);

			




	
	
	
		
 
				size->width += padding.width;

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_C_HAS_PASSWORD:

			




        

    


    
    

    

        

                

                    src/genworld_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -1430,7 +1430,7 @@ struct GenerateProgressWindow : public W

			




	
	
	
		
 

			




	
	
	
		
 
			case WID_GP_PROGRESS_TEXT:

			




	
	
	
		
 
				for (uint i = 0; i < GWP_CLASS_COUNT; i++) {

			




	
	
	
		
 
					size->width = std::max(size->width, GetStringBoundingBox(_generation_class_table[i]).width);

			




	
	
	
		
 
					size->width = std::max(size->width, GetStringBoundingBox(_generation_class_table[i]).width + padding.width);

			




	
	
	
		
 
				}

			




	
	
	
		
 
				size->height = FONT_HEIGHT_NORMAL * 2 + WidgetDimensions::scaled.vsep_normal;

			




	
	
	
		
 
				break;

			




        

    


    
    

    

        

                

                    src/newgrf_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2227,7 +2227,7 @@ struct ScanProgressWindow : public Windo

			




	
	
	
		
 
				SetDParamMaxDigits(1, 4);

			




	
	
	
		
 
				/* We really don't know the width. We could determine it by scanning the NewGRFs,

			




	
	
	
		
 
				 * but this is the status window for scanning them... */

			




	
	
	
		
 
				size->width = std::max<uint>(size->width, GetStringBoundingBox(STR_NEWGRF_SCAN_STATUS).width);

			




	
	
	
		
 
				size->width = std::max<uint>(size->width, GetStringBoundingBox(STR_NEWGRF_SCAN_STATUS).width + padding.width);

			




	
	
	
		
 
				size->height = FONT_HEIGHT_NORMAL * 2 + WidgetDimensions::scaled.vsep_normal;

			




	
	
	
		
 
				break;

			




	
	
	
		
 
		}

			




        

    


    
    

    

        

                

                    src/settings_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2123,7 +2123,7 @@ struct GameSettingsWindow : Window {

			




	
	
	
		
 
				};

			




	
	
	
		
 
				for (uint i = 0; i < lengthof(setting_types); i++) {

			




	
	
	
		
 
					SetDParam(0, setting_types[i]);

			




	
	
	
		
 
					size->width = std::max(size->width, GetStringBoundingBox(STR_CONFIG_SETTING_TYPE).width);

			




	
	
	
		
 
					size->width = std::max(size->width, GetStringBoundingBox(STR_CONFIG_SETTING_TYPE).width + padding.width);

			




	
	
	
		
 
				}

			




	
	
	
		
 
				size->height = 2 * FONT_HEIGHT_NORMAL + WidgetDimensions::scaled.vsep_normal +

			




	
	
	
		
 
						std::max(size->height, GetSettingsTree().GetMaxHelpHeight(size->width));

			




        

    


    
    

    

        

                

                    src/town_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -263,7 +263,7 @@ public:

			




	
	
	
		
 
				size->height = (TACT_COUNT + 1) * FONT_HEIGHT_NORMAL + padding.height;

			




	
	
	
		
 
				size->width = GetStringBoundingBox(STR_LOCAL_AUTHORITY_ACTIONS_TITLE).width;

			




	
	
	
		
 
				for (uint i = 0; i < TACT_COUNT; i++ ) {

			




	
	
	
		
 
					size->width = std::max(size->width, GetStringBoundingBox(STR_LOCAL_AUTHORITY_ACTION_SMALL_ADVERTISING_CAMPAIGN + i).width);

			




	
	
	
		
 
					size->width = std::max(size->width, GetStringBoundingBox(STR_LOCAL_AUTHORITY_ACTION_SMALL_ADVERTISING_CAMPAIGN + i).width + padding.width);

			




	
	
	
		
 
				}

			




	
	
	
		
 
				size->width += padding.width;

			




	
	
	
		
 
				break;

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support