Skip to content

Commit 597a830

Browse files
libretroadminLibretroAdmin
authored andcommitted
settings: migrate the RGUI transparency setting to a single-source def file
Performed by tools/settings_migrate_group.py with the standard battery including the platform-profile lanes and the integrated enum consolidation stage.
1 parent 48ebc3c commit 597a830

8 files changed

Lines changed: 129 additions & 17 deletions

File tree

configuration.c

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1964,6 +1964,11 @@ static struct config_bool_setting *populate_settings_bool(
19641964
#define SETTINGS_DEF_CONFIG_PASS
19651965
#include "settings/settings_def_video_sync.h"
19661966
#ifdef HAVE_MENU
1967+
#ifdef HAVE_RGUI
1968+
#include "settings/settings_def_menu_rgui_transparency.h"
1969+
#endif
1970+
#endif
1971+
#ifdef HAVE_MENU
19671972
#include "settings/settings_def_menu_wallpaper.h"
19681973
#endif
19691974
#include "settings/settings_def_runahead_warnings.h"
@@ -2162,7 +2167,6 @@ static struct config_bool_setting *populate_settings_bool(
21622167
SETTING_BOOL("rgui_background_filler_thickness_enable", &settings->bools.menu_rgui_background_filler_thickness_enable, true, true, false);
21632168
SETTING_BOOL("rgui_border_filler_thickness_enable", &settings->bools.menu_rgui_border_filler_thickness_enable, true, true, false);
21642169
SETTING_BOOL("rgui_border_filler_enable", &settings->bools.menu_rgui_border_filler_enable, true, true, false);
2165-
SETTING_BOOL("menu_rgui_transparency", &settings->bools.menu_rgui_transparency, true, DEFAULT_RGUI_TRANSPARENCY, false);
21662170
SETTING_BOOL("menu_rgui_shadows", &settings->bools.menu_rgui_shadows, true, DEFAULT_RGUI_SHADOWS, false);
21672171
SETTING_BOOL("rgui_extended_ascii", &settings->bools.menu_rgui_extended_ascii, true, DEFAULT_RGUI_EXTENDED_ASCII, false);
21682172
SETTING_BOOL("rgui_switch_icons", &settings->bools.menu_rgui_switch_icons, true, DEFAULT_RGUI_SWITCH_ICONS, false);
@@ -2351,6 +2355,11 @@ static struct config_float_setting *populate_settings_float(
23512355
#define SETTINGS_DEF_CONFIG_PASS
23522356
#include "settings/settings_def_video_sync.h"
23532357
#ifdef HAVE_MENU
2358+
#ifdef HAVE_RGUI
2359+
#include "settings/settings_def_menu_rgui_transparency.h"
2360+
#endif
2361+
#endif
2362+
#ifdef HAVE_MENU
23542363
#include "settings/settings_def_menu_wallpaper.h"
23552364
#endif
23562365
#include "settings/settings_def_runahead_warnings.h"
@@ -2682,6 +2691,11 @@ static struct config_uint_setting *populate_settings_uint(
26822691
#define SETTINGS_DEF_CONFIG_PASS
26832692
#include "settings/settings_def_video_sync.h"
26842693
#ifdef HAVE_MENU
2694+
#ifdef HAVE_RGUI
2695+
#include "settings/settings_def_menu_rgui_transparency.h"
2696+
#endif
2697+
#endif
2698+
#ifdef HAVE_MENU
26852699
#include "settings/settings_def_menu_wallpaper.h"
26862700
#endif
26872701
#include "settings/settings_def_runahead_warnings.h"
@@ -2988,6 +3002,11 @@ static struct config_int_setting *populate_settings_int(
29883002
#define SETTINGS_DEF_CONFIG_PASS
29893003
#include "settings/settings_def_video_sync.h"
29903004
#ifdef HAVE_MENU
3005+
#ifdef HAVE_RGUI
3006+
#include "settings/settings_def_menu_rgui_transparency.h"
3007+
#endif
3008+
#endif
3009+
#ifdef HAVE_MENU
29913010
#include "settings/settings_def_menu_wallpaper.h"
29923011
#endif
29933012
#include "settings/settings_def_runahead_warnings.h"

intl/msg_hash_lbl.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5065,10 +5065,6 @@ MSG_HASH(
50655065
MENU_ENUM_LABEL_MENU_RGUI_ASPECT_RATIO_LOCK,
50665066
MENU_ENUM_LABEL_MENU_RGUI_ASPECT_RATIO_LOCK_STR
50675067
)
5068-
MSG_HASH(
5069-
MENU_ENUM_LABEL_MENU_RGUI_TRANSPARENCY,
5070-
MENU_ENUM_LABEL_MENU_RGUI_TRANSPARENCY_STR
5071-
)
50725068
MSG_HASH(
50735069
MENU_ENUM_LABEL_MENU_RGUI_SHADOWS,
50745070
MENU_ENUM_LABEL_MENU_RGUI_SHADOWS_STR

intl/msg_hash_us.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
537537
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) n,
538538
#include "../settings/settings_def_video_fullscreen.h"
539539
#include "../settings/settings_def_video_sync.h"
540+
#include "../settings/settings_def_menu_rgui_transparency.h"
540541
#include "../settings/settings_def_menu_wallpaper.h"
541542
#include "../settings/settings_def_runahead_warnings.h"
542543
#include "../settings/settings_def_input_auto_mouse_grab.h"
@@ -606,6 +607,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
606607
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) (uint32_t)MENU_ENUM_LABEL_##T,
607608
#include "../settings/settings_def_video_fullscreen.h"
608609
#include "../settings/settings_def_video_sync.h"
610+
#include "../settings/settings_def_menu_rgui_transparency.h"
609611
#include "../settings/settings_def_menu_wallpaper.h"
610612
#include "../settings/settings_def_runahead_warnings.h"
611613
#include "../settings/settings_def_input_auto_mouse_grab.h"

intl/msg_hash_us.h

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12041,14 +12041,38 @@ MSG_HASH(
1204112041
MENU_ENUM_SUBLABEL_RGUI_MENU_THEME_PRESET,
1204212042
"Select a menu theme preset from File Browser."
1204312043
)
12044-
MSG_HASH(
12045-
MENU_ENUM_LABEL_VALUE_MENU_RGUI_TRANSPARENCY,
12046-
"Transparency"
12047-
)
12048-
MSG_HASH(
12049-
MENU_ENUM_SUBLABEL_MENU_RGUI_TRANSPARENCY,
12050-
"Enable background display of content while Quick Menu is active. Disabling transparency may alter theme colors."
12051-
)
12044+
/* GENERATED REGION: RGUI transparency setting (see settings_def_menu_rgui_transparency.h). */
12045+
#define SETTINGS_DEF_STRINGS_PASS
12046+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
12047+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
12048+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
12049+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
12050+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
12051+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
12052+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
12053+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
12054+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
12055+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
12056+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
12057+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
12058+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
12059+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
12060+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
12061+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
12062+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
12063+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
12064+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
12065+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
12066+
#include "../settings/settings_def_menu_rgui_transparency.h"
12067+
#undef S_BOOL
12068+
#undef S_BOOL_NS
12069+
#undef S_UINT
12070+
#undef S_UINT_NS
12071+
#undef S_INT
12072+
#undef S_INT_NS
12073+
#undef S_FLOAT
12074+
#undef S_FLOAT_NS
12075+
#undef SETTINGS_DEF_STRINGS_PASS
1205212076
MSG_HASH(
1205312077
MENU_ENUM_LABEL_VALUE_MENU_RGUI_SHADOWS,
1205412078
"Shadow Effects"

menu/menu_setting.c

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16929,8 +16929,32 @@ static bool setting_append_list(
1692916929
{
1693016930
{
1693116931
static const setting_desc_t menu_desc_10[] = {
16932-
SDESC_BOOL_ROW(menu_rgui_transparency, MENU_RGUI_TRANSPARENCY,
16933-
DEFAULT_RGUI_TRANSPARENCY, SD_FLAG_NONE, 0, 0),
16932+
/* GENERATED: rows come from settings_def_menu_rgui_transparency.h in order. */
16933+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
16934+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
16935+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
16936+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
16937+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
16938+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
16939+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
16940+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
16941+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
16942+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
16943+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
16944+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
16945+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
16946+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
16947+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
16948+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
16949+
#include "../settings/settings_def_menu_rgui_transparency.h"
16950+
#undef S_BOOL
16951+
#undef S_BOOL_NS
16952+
#undef S_UINT
16953+
#undef S_UINT_NS
16954+
#undef S_INT
16955+
#undef S_INT_NS
16956+
#undef S_FLOAT
16957+
#undef S_FLOAT_NS
1693416958
};
1693516959
settings_list_add_desc(list, list_info, settings,
1693616960
menu_desc_10, ARRAY_SIZE(menu_desc_10),

msg_hash.h

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2272,7 +2272,44 @@ enum msg_hash_enums
22722272
MENU_LABEL(MENU_RGUI_INTERNAL_UPSCALE_LEVEL),
22732273
MENU_LABEL(MENU_RGUI_ASPECT_RATIO),
22742274
MENU_LABEL(MENU_RGUI_ASPECT_RATIO_LOCK),
2275-
MENU_LABEL(MENU_RGUI_TRANSPARENCY),
2275+
/* GENERATED REGION: RGUI transparency setting enum rows (see settings/settings_def_menu_rgui_transparency.h). */
2276+
#define SETTINGS_DEF_ENUM_PASS
2277+
#define SETTINGS_DEF_STRINGS_PASS
2278+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) MENU_LABEL(T),
2279+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) MENU_LABEL(T),
2280+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
2281+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
2282+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
2283+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
2284+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LABEL(T),
2285+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LABEL(T),
2286+
#define S_BOOL_H(f, T, n, d, sd, df, c, us, sub) MENU_LBL_H(T),
2287+
#define S_UINT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
2288+
#define S_BOOL_NS_H(f, T, n, d, sd, df, c, us) MENU_LBL_H(T),
2289+
#define S_INT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
2290+
#define S_FLOAT_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LBL_H(T),
2291+
#define S_UINT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
2292+
#define S_INT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
2293+
#define S_FLOAT_NS_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LBL_H(T),
2294+
#include "settings/settings_def_menu_rgui_transparency.h"
2295+
#undef S_BOOL
2296+
#undef S_BOOL_NS
2297+
#undef S_UINT
2298+
#undef S_UINT_NS
2299+
#undef S_INT
2300+
#undef S_INT_NS
2301+
#undef S_FLOAT
2302+
#undef S_FLOAT_NS
2303+
#undef S_BOOL_H
2304+
#undef S_UINT_H
2305+
#undef S_BOOL_NS_H
2306+
#undef S_INT_H
2307+
#undef S_FLOAT_H
2308+
#undef S_UINT_NS_H
2309+
#undef S_INT_NS_H
2310+
#undef S_FLOAT_NS_H
2311+
#undef SETTINGS_DEF_STRINGS_PASS
2312+
#undef SETTINGS_DEF_ENUM_PASS
22762313
MENU_LABEL(MENU_RGUI_SHADOWS),
22772314
MENU_LABEL(MENU_RGUI_PARTICLE_EFFECT),
22782315
MENU_LABEL(MENU_RGUI_PARTICLE_EFFECT_SPEED),

msg_hash_lbl_str.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1273,7 +1273,6 @@
12731273
#define MENU_ENUM_LABEL_MENU_RGUI_INTERNAL_UPSCALE_LEVEL_STR "rgui_internal_upscale_level"
12741274
#define MENU_ENUM_LABEL_MENU_RGUI_ASPECT_RATIO_STR "rgui_aspect_ratio"
12751275
#define MENU_ENUM_LABEL_MENU_RGUI_ASPECT_RATIO_LOCK_STR "rgui_aspect_ratio_lock"
1276-
#define MENU_ENUM_LABEL_MENU_RGUI_TRANSPARENCY_STR "menu_rgui_transparency"
12771276
#define MENU_ENUM_LABEL_MENU_RGUI_SHADOWS_STR "menu_rgui_shadows"
12781277
#define MENU_ENUM_LABEL_MENU_RGUI_PARTICLE_EFFECT_STR "rgui_particle_effect"
12791278
#define MENU_ENUM_LABEL_MENU_RGUI_PARTICLE_EFFECT_SPEED_STR "rgui_particle_effect_speed"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/* Single-source definitions: RGUI transparency setting.
2+
* Grammar identical to settings_def_video_sync.h plus S_FLOAT and
3+
* the _NS no-sublabel variants; the descriptor argument span
4+
* matches SDESC_<kind>_ROW; row order is menu display order;
5+
* h2json.py parses these rows for the Crowdin source upload. */
6+
7+
S_BOOL(menu_rgui_transparency, MENU_RGUI_TRANSPARENCY,
8+
"menu_rgui_transparency",
9+
DEFAULT_RGUI_TRANSPARENCY, SD_FLAG_NONE, 0, 0,
10+
"Transparency",
11+
"Enable background display of content while Quick Menu is active. Disabling transparency may alter theme colors.")

0 commit comments

Comments
 (0)