Skip to content

Commit 6e8d5dd

Browse files
committed
rg_gui: Allow targets to override default language and font
Maybe I should put all default values for all settings together and allow targets to override any of them?
1 parent adff5de commit 6e8d5dd

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

components/retro-go/config.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,3 +158,11 @@
158158
#ifndef RG_SCREEN_VISIBLE_AREA
159159
#define RG_SCREEN_VISIBLE_AREA {0, 0, 0, 0}
160160
#endif
161+
162+
#ifndef RG_LANG_DEFAULT
163+
#define RG_LANG_DEFAULT RG_LANG_EN
164+
#endif
165+
166+
#ifndef RG_FONT_DEFAULT
167+
#define RG_FONT_DEFAULT RG_FONT_VERA_11
168+
#endif

components/retro-go/fonts/fonts.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ enum {
2020
RG_FONT_VERA_11,
2121
RG_FONT_VERA_14,
2222
RG_FONT_MAX,
23-
24-
RG_FONT_DEFAULT = RG_FONT_VERA_11,
2523
};
2624

2725
static const rg_font_t *fonts[RG_FONT_MAX] = {

components/retro-go/rg_gui.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ void rg_gui_init(void)
109109
gui.margins = (__typeof__(gui.margins))RG_SCREEN_SAFE_AREA;
110110
gui.draw_buffer = get_draw_buffer(gui.screen_width, 18, C_BLACK);
111111
gui.show_clock = rg_settings_get_boolean(NS_GLOBAL, SETTING_CLOCK, false);
112-
if (!rg_gui_set_language_id(rg_settings_get_number(NS_GLOBAL, SETTING_LANGUAGE, RG_LANG_EN)))
113-
rg_gui_set_language_id(RG_LANG_EN);
112+
if (!rg_gui_set_language_id(rg_settings_get_number(NS_GLOBAL, SETTING_LANGUAGE, RG_LANG_DEFAULT)))
113+
rg_gui_set_language_id(0);
114114
if (!rg_gui_set_font(rg_settings_get_number(NS_GLOBAL, SETTING_FONTTYPE, RG_FONT_DEFAULT)))
115115
rg_gui_set_font(0);
116116
rg_gui_set_theme(rg_settings_get_string(NS_GLOBAL, SETTING_THEME, NULL));

0 commit comments

Comments
 (0)