Changeset - r28158:6873914f9d59
Parent rev.
Child rev.
[Not reviewed]
master
0 1 0
Peter Nelson - 13 months ago 2023-11-20 01:12:25
peter1138@openttd.org
Change: Use sparse padding for main intro menu. (#11475)
1 file changed with 64 insertions and 102 deletions:
src/intro_gui.cpp
64
102
0 comments (0 inline, 0 general)
src/intro_gui.cpp
➞
Show inline comments
 
@@ -381,118 +381,80 @@ struct SelectGameWindow : public Window
 
static const NWidgetPart _nested_select_game_widgets[] = {
 
	NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_INTRO_CAPTION, STR_NULL),
 
	NWidget(WWT_PANEL, COLOUR_BROWN),
 
	NWidget(NWID_SPACER), SetMinimalSize(0, 8),
 
		NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0), SetPadding(WidgetDimensions::unscaled.sparse),
 

			




	
	
	
		
 
	/* 'New Game' and 'Load Game' buttons */

			




	
	
	
		
 
	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_GENERATE_GAME), SetMinimalSize(158, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_NEW_GAME, STR_INTRO_TOOLTIP_NEW_GAME), SetPadding(0, 0, 0, 10), SetFill(1, 0),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_LOAD_GAME), SetMinimalSize(158, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_LOAD_GAME, STR_INTRO_TOOLTIP_LOAD_GAME), SetPadding(0, 10, 0, 0), SetFill(1, 0),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 
			NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0),

			




	
	
	
		
 
				/* 'New Game' and 'Load Game' buttons */

			




	
	
	
		
 
				NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

			




	
	
	
		
 
					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_GENERATE_GAME), SetDataTip(STR_INTRO_NEW_GAME, STR_INTRO_TOOLTIP_NEW_GAME), SetFill(1, 0),

			




	
	
	
		
 
					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_LOAD_GAME), SetDataTip(STR_INTRO_LOAD_GAME, STR_INTRO_TOOLTIP_LOAD_GAME), SetFill(1, 0),

			




	
	
	
		
 
				EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
				/* 'Play Scenario' and 'Play Heightmap' buttons */

			




	
	
	
		
 
				NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

			




	
	
	
		
 
					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_SCENARIO), SetDataTip(STR_INTRO_PLAY_SCENARIO, STR_INTRO_TOOLTIP_PLAY_SCENARIO), SetFill(1, 0),

			




	
	
	
		
 
					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_HEIGHTMAP), SetDataTip(STR_INTRO_PLAY_HEIGHTMAP, STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP), SetFill(1, 0),

			




	
	
	
		
 
				EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
	NWidget(NWID_SPACER), SetMinimalSize(0, 6),

			




	
	
	
		
 
				/* 'Scenario Editor' and 'Multiplayer' buttons */

			




	
	
	
		
 
				NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

			




	
	
	
		
 
					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_EDIT_SCENARIO), SetDataTip(STR_INTRO_SCENARIO_EDITOR, STR_INTRO_TOOLTIP_SCENARIO_EDITOR), SetFill(1, 0),

			




	
	
	
		
 
					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_NETWORK), SetDataTip(STR_INTRO_MULTIPLAYER, STR_INTRO_TOOLTIP_MULTIPLAYER), SetFill(1, 0),

			




	
	
	
		
 
				EndContainer(),

			




	
	
	
		
 
			EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
	/* 'Play Scenario' and 'Play Heightmap' buttons */

			




	
	
	
		
 
	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_SCENARIO), SetMinimalSize(158, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_PLAY_SCENARIO, STR_INTRO_TOOLTIP_PLAY_SCENARIO), SetPadding(0, 0, 0, 10), SetFill(1, 0),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_HEIGHTMAP), SetMinimalSize(158, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_PLAY_HEIGHTMAP, STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP), SetPadding(0, 10, 0, 0), SetFill(1, 0),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 
			/* Climate selection buttons */

			




	
	
	
		
 
			NWidget(NWID_HORIZONTAL), SetPIP(0, WidgetDimensions::unscaled.hsep_wide, 0), SetPIPRatio(1, 1, 1),

			




	
	
	
		
 
				NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_TEMPERATE_LANDSCAPE), SetDataTip(SPR_SELECT_TEMPERATE, STR_INTRO_TOOLTIP_TEMPERATE),

			




	
	
	
		
 
				NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_ARCTIC_LANDSCAPE), SetDataTip(SPR_SELECT_SUB_ARCTIC, STR_INTRO_TOOLTIP_SUB_ARCTIC_LANDSCAPE),

			




	
	
	
		
 
				NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_TROPIC_LANDSCAPE), SetDataTip(SPR_SELECT_SUB_TROPICAL, STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE),

			




	
	
	
		
 
				NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_TOYLAND_LANDSCAPE), SetDataTip(SPR_SELECT_TOYLAND, STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE),

			




	
	
	
		
 
			EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
	NWidget(NWID_SPACER), SetMinimalSize(0, 6),

			




	
	
	
		
 
			NWidget(NWID_SELECTION, INVALID_COLOUR, WID_SGI_BASESET_SELECTION),

			




	
	
	
		
 
				NWidget(NWID_VERTICAL),

			




	
	
	
		
 
					NWidget(WWT_EMPTY, COLOUR_ORANGE, WID_SGI_BASESET), SetFill(1, 0),

			




	
	
	
		
 
				EndContainer(),

			




	
	
	
		
 
			EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
	/* 'Scenario Editor' and 'Multiplayer' buttons */

			




	
	
	
		
 
	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_EDIT_SCENARIO), SetMinimalSize(158, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_SCENARIO_EDITOR, STR_INTRO_TOOLTIP_SCENARIO_EDITOR), SetPadding(0, 0, 0, 10), SetFill(1, 0),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_PLAY_NETWORK), SetMinimalSize(158, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_MULTIPLAYER, STR_INTRO_TOOLTIP_MULTIPLAYER), SetPadding(0, 10, 0, 0), SetFill(1, 0),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 
			NWidget(NWID_SELECTION, INVALID_COLOUR, WID_SGI_TRANSLATION_SELECTION),

			




	
	
	
		
 
				NWidget(NWID_VERTICAL),

			




	
	
	
		
 
					NWidget(WWT_EMPTY, COLOUR_ORANGE, WID_SGI_TRANSLATION), SetFill(1, 0),

			




	
	
	
		
 
				EndContainer(),

			




	
	
	
		
 
			EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
	NWidget(NWID_SPACER), SetMinimalSize(0, 7),

			




	
	
	
		
 
			NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_sparse, 0),

			




	
	
	
		
 
				/* 'Game Options' and 'Settings' buttons */

			




	
	
	
		
 
				NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

			




	
	
	
		
 
					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_OPTIONS), SetDataTip(STR_INTRO_GAME_OPTIONS, STR_INTRO_TOOLTIP_GAME_OPTIONS), SetFill(1, 0),

			




	
	
	
		
 
					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_SETTINGS_OPTIONS), SetDataTip(STR_INTRO_CONFIG_SETTINGS_TREE, STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE), SetFill(1, 0),

			




	
	
	
		
 
				EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
	/* Climate selection buttons */

			




	
	
	
		
 
	NWidget(NWID_HORIZONTAL),

			




	
	
	
		
 
		NWidget(NWID_SPACER), SetMinimalSize(10, 0), SetFill(1, 0),

			




	
	
	
		
 
		NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_TEMPERATE_LANDSCAPE), SetMinimalSize(77, 55),

			




	
	
	
		
 
							SetDataTip(SPR_SELECT_TEMPERATE, STR_INTRO_TOOLTIP_TEMPERATE),

			




	
	
	
		
 
		NWidget(NWID_SPACER), SetMinimalSize(3, 0), SetFill(1, 0),

			




	
	
	
		
 
		NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_ARCTIC_LANDSCAPE), SetMinimalSize(77, 55),

			




	
	
	
		
 
							SetDataTip(SPR_SELECT_SUB_ARCTIC, STR_INTRO_TOOLTIP_SUB_ARCTIC_LANDSCAPE),

			




	
	
	
		
 
		NWidget(NWID_SPACER), SetMinimalSize(3, 0), SetFill(1, 0),

			




	
	
	
		
 
		NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_TROPIC_LANDSCAPE), SetMinimalSize(77, 55),

			




	
	
	
		
 
							SetDataTip(SPR_SELECT_SUB_TROPICAL, STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE),

			




	
	
	
		
 
		NWidget(NWID_SPACER), SetMinimalSize(3, 0), SetFill(1, 0),

			




	
	
	
		
 
		NWidget(WWT_IMGBTN_2, COLOUR_ORANGE, WID_SGI_TOYLAND_LANDSCAPE), SetMinimalSize(77, 55),

			




	
	
	
		
 
							SetDataTip(SPR_SELECT_TOYLAND, STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE),

			




	
	
	
		
 
		NWidget(NWID_SPACER), SetMinimalSize(10, 0), SetFill(1, 0),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 
				/* 'AI Settings' and 'Game Script Settings' buttons */

			




	
	
	
		
 
				NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

			




	
	
	
		
 
					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_AI_SETTINGS), SetDataTip(STR_INTRO_AI_SETTINGS, STR_INTRO_TOOLTIP_AI_SETTINGS), SetFill(1, 0),

			




	
	
	
		
 
					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_GS_SETTINGS), SetDataTip(STR_INTRO_GAMESCRIPT_SETTINGS, STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS), SetFill(1, 0),

			




	
	
	
		
 
				EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
	NWidget(NWID_SPACER), SetMinimalSize(0, 7),

			




	
	
	
		
 
	NWidget(NWID_SELECTION, INVALID_COLOUR, WID_SGI_BASESET_SELECTION),

			




	
	
	
		
 
		NWidget(NWID_VERTICAL),

			




	
	
	
		
 
			NWidget(WWT_EMPTY, COLOUR_ORANGE, WID_SGI_BASESET), SetMinimalSize(316, 12), SetFill(1, 0), SetPadding(0, 10, 7, 10),

			




	
	
	
		
 
				/* 'Check Online Content' and 'NewGRF Settings' buttons */

			




	
	
	
		
 
				NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

			




	
	
	
		
 
					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_CONTENT_DOWNLOAD), SetDataTip(STR_INTRO_ONLINE_CONTENT, STR_INTRO_TOOLTIP_ONLINE_CONTENT), SetFill(1, 0),

			




	
	
	
		
 
					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_GRF_SETTINGS), SetDataTip(STR_INTRO_NEWGRF_SETTINGS, STR_INTRO_TOOLTIP_NEWGRF_SETTINGS), SetFill(1, 0),

			




	
	
	
		
 
				EndContainer(),

			




	
	
	
		
 
			EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
			/* 'Help and Manuals' and 'Highscore Table' buttons */

			




	
	
	
		
 
			NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

			




	
	
	
		
 
				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_HELP), SetDataTip(STR_INTRO_HELP, STR_INTRO_TOOLTIP_HELP), SetFill(1, 0),

			




	
	
	
		
 
				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_HIGHSCORE), SetDataTip(STR_INTRO_HIGHSCORE, STR_INTRO_TOOLTIP_HIGHSCORE), SetFill(1, 0),

			




	
	
	
		
 
			EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
			/* 'Exit' button */

			




	
	
	
		
 
			NWidget(NWID_HORIZONTAL), SetPIPRatio(1, 0, 1),

			




	
	
	
		
 
				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_EXIT), SetMinimalSize(128, 0), SetDataTip(STR_INTRO_QUIT, STR_INTRO_TOOLTIP_QUIT),

			




	
	
	
		
 
			EndContainer(),

			




	
	
	
		
 
		EndContainer(),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 
	NWidget(NWID_SELECTION, INVALID_COLOUR, WID_SGI_TRANSLATION_SELECTION),

			




	
	
	
		
 
		NWidget(NWID_VERTICAL),

			




	
	
	
		
 
			NWidget(WWT_EMPTY, COLOUR_ORANGE, WID_SGI_TRANSLATION), SetMinimalSize(316, 12), SetFill(1, 0), SetPadding(0, 10, 7, 10),

			




	
	
	
		
 
		EndContainer(),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
	/* 'Game Options' and 'Settings' buttons */

			




	
	
	
		
 
	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_OPTIONS), SetMinimalSize(158, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_GAME_OPTIONS, STR_INTRO_TOOLTIP_GAME_OPTIONS), SetPadding(0, 0, 0, 10), SetFill(1, 0),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_SETTINGS_OPTIONS), SetMinimalSize(158, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_CONFIG_SETTINGS_TREE, STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE), SetPadding(0, 10, 0, 0), SetFill(1, 0),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
	NWidget(NWID_SPACER), SetMinimalSize(0, 6),

			




	
	
	
		
 

			




	
	
	
		
 
	/* 'AI Settings' and 'Game Script Settings' buttons */

			




	
	
	
		
 
	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_AI_SETTINGS), SetMinimalSize(158, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_AI_SETTINGS, STR_INTRO_TOOLTIP_AI_SETTINGS), SetPadding(0, 0, 0, 10), SetFill(1, 0),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_GS_SETTINGS), SetMinimalSize(158, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_GAMESCRIPT_SETTINGS, STR_INTRO_TOOLTIP_GAMESCRIPT_SETTINGS), SetPadding(0, 10, 0, 0), SetFill(1, 0),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
	NWidget(NWID_SPACER), SetMinimalSize(0, 6),

			




	
	
	
		
 

			




	
	
	
		
 
	/* 'Check Online Content' and 'NewGRF Settings' buttons */

			




	
	
	
		
 
	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_CONTENT_DOWNLOAD), SetMinimalSize(158, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_ONLINE_CONTENT, STR_INTRO_TOOLTIP_ONLINE_CONTENT), SetPadding(0, 0, 0, 10), SetFill(1, 0),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_GRF_SETTINGS), SetMinimalSize(158, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_NEWGRF_SETTINGS, STR_INTRO_TOOLTIP_NEWGRF_SETTINGS), SetPadding(0, 10, 0, 0), SetFill(1, 0),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
	NWidget(NWID_SPACER), SetMinimalSize(0, 6),

			




	
	
	
		
 

			




	
	
	
		
 
	/* 'Help and Manuals' and 'Highscore Table' buttons */

			




	
	
	
		
 
	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_HELP), SetMinimalSize(158, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_HELP, STR_INTRO_TOOLTIP_HELP), SetPadding(0, 0, 0, 10), SetFill(1, 0),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_HIGHSCORE), SetMinimalSize(158, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_HIGHSCORE, STR_INTRO_TOOLTIP_HIGHSCORE), SetPadding(0, 10, 0, 0), SetFill(1, 0),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
	NWidget(NWID_SPACER), SetMinimalSize(0, 6),

			




	
	
	
		
 

			




	
	
	
		
 
	/* 'Exit' button */

			




	
	
	
		
 
	NWidget(NWID_HORIZONTAL),

			




	
	
	
		
 
		NWidget(NWID_SPACER), SetFill(1, 0),

			




	
	
	
		
 
		NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_SGI_EXIT), SetMinimalSize(128, 12),

			




	
	
	
		
 
							SetDataTip(STR_INTRO_QUIT, STR_INTRO_TOOLTIP_QUIT),

			




	
	
	
		
 
		NWidget(NWID_SPACER), SetFill(1, 0),

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 

			




	
	
	
		
 
	NWidget(NWID_SPACER), SetMinimalSize(0, 8),

			




	
	
	
		
 

			




	
	
	
		
 
	EndContainer(),

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
static WindowDesc _select_game_desc(__FILE__, __LINE__,

			




        

    



    


    



    



      

      





    
    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