--- /home/yonatyt/simu-git/simutrans-master/gui/gui_theme.h 2020-03-12 09:44:15.000000000 -0400 +++ /home/yonatyt/simu-git/files/gui_theme.h 2020-03-15 09:06:41.585949670 -0400 @@ -238,7 +238,9 @@ static PIXVAL gui_color_statusbar_divider; //@< Color to draw statusbar divider static PIXVAL gui_highlight_color; //@< Color to draw highlight dividers (tabs) static PIXVAL gui_shadow_color; //@< Color to draw shadowed dividers (tabs) - /// @} + static PIXVAL gui_color_loadingbar_inner; + static PIXVAL gui_color_loadingbar_progress; + /// @} /// @name GUI element sizes used by gui components /// @{ --- /home/yonatyt/simu-git/simutrans-master/gui/gui_theme.cc 2020-03-12 09:44:15.000000000 -0400 +++ /home/yonatyt/simu-git/files/gui_theme.cc 2020-03-15 09:08:35.022076623 -0400 @@ -55,6 +55,8 @@ PIXVAL gui_theme_t::gui_color_statusbar_divider; PIXVAL gui_theme_t::gui_highlight_color; PIXVAL gui_theme_t::gui_shadow_color; +PIXVAL gui_theme_t::gui_color_loadingbar_inner; +PIXVAL gui_theme_t::gui_color_loadingbar_progress; /** * Max Kielland @@ -168,6 +170,9 @@ gui_highlight_color = color_idx_to_rgb(MN_GREY4); gui_shadow_color = color_idx_to_rgb(MN_GREY0); + gui_color_loadingbar_inner = color_idx_to_rgb(COL_GREY5); + gui_color_loadingbar_progress = color_idx_to_rgb(COL_BLUE); + gui_button_size = scr_size(92,14); gui_color_button_size = scr_size(92,16); gui_button_text_offset = scr_size(0,0); @@ -497,6 +502,8 @@ gui_theme_t::gui_color_statusbar_divider = (PIXVAL)contents.get_color("gui_color_statusbar_divider", SYSCOL_STATUSBAR_DIVIDER); gui_theme_t::gui_highlight_color = (PIXVAL)contents.get_color("gui_highlight_color", SYSCOL_HIGHLIGHT); gui_theme_t::gui_shadow_color = (PIXVAL)contents.get_color("gui_shadow_color", SYSCOL_SHADOW); + gui_theme_t::gui_color_loadingbar_inner = (PIXVAL)contents.get_color("gui_color_loadingbar_inner", SYSCOL_LOADINGBAR_INNER); + gui_theme_t::gui_color_loadingbar_progress = (PIXVAL)contents.get_color("gui_color_loadingbar_progress", SYSCOL_LOADINGBAR_PROGRESS); gui_theme_t::gui_waitingbar_width = (uint32)contents.get_int("gui_waitingbar_width", gui_theme_t::gui_waitingbar_width); --- /home/yonatyt/simu-git/simutrans-master/simcolor.h 2020-03-12 09:44:15.000000000 -0400 +++ /home/yonatyt/simu-git/files/simcolor.h 2020-03-15 09:09:08.483286215 -0400 @@ -152,5 +152,7 @@ #define SYSCOL_STATUSBAR_DIVIDER gui_theme_t::gui_color_statusbar_divider #define SYSCOL_HIGHLIGHT gui_theme_t::gui_highlight_color #define SYSCOL_SHADOW gui_theme_t::gui_shadow_color +#define SYSCOL_LOADINGBAR_INNER gui_theme_t::gui_color_loadingbar_inner +#define SYSCOL_LOADINGBAR_PROGRESS gui_theme_t::gui_color_loadingbar_progress #endif --- /home/yonatyt/simu-git/simutrans-master/simloadingscreen.cc 2020-03-12 09:44:15.000000000 -0400 +++ /home/yonatyt/simu-git/files/simloadingscreen.cc 2020-03-15 09:10:34.767937511 -0400 @@ -87,10 +87,10 @@ display_ddd_box_rgb( quarter_width-1, bar_y + 1, half_width+2, bar_height - 2, color_idx_to_rgb(COL_GREY4), color_idx_to_rgb(COL_GREY6), true ); // inner - display_fillbox_wh_rgb( quarter_width, bar_y + 2, half_width, bar_height - 4, color_idx_to_rgb(COL_GREY5), true); + display_fillbox_wh_rgb( quarter_width, bar_y + 2, half_width, bar_height - 4, SYSCOL_LOADINGBAR_INNER, true); // progress - display_fillbox_wh_rgb( quarter_width, bar_y + 4, bar_len, bar_height - 8, color_idx_to_rgb(COL_BLUE), true ); + display_fillbox_wh_rgb( quarter_width, bar_y + 4, bar_len, bar_height - 8, SYSCOL_LOADINGBAR_PROGRESS, true ); if( what ) { display_proportional_rgb( half_width, bar_text_y, what, ALIGN_CENTER_H, SYSCOL_TEXT_HIGHLIGHT, false );