Skip to content

Commit 29da841

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the overlay auto-scale 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 de24e63 commit 29da841

8 files changed

Lines changed: 359 additions & 18 deletions

File tree

‎configuration.c‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1977,6 +1977,9 @@ static struct config_bool_setting *populate_settings_bool(
19771977
#include "settings/settings_def_video_fullscreen.h"
19781978
#define SETTINGS_DEF_CONFIG_PASS
19791979
#include "settings/settings_def_video_sync.h"
1980+
#ifdef HAVE_OVERLAY
1981+
#include "settings/settings_def_overlay_auto_scale.h"
1982+
#endif
19801983
#include "settings/settings_def_notification_widgets.h"
19811984
#ifdef HAVE_SMBCLIENT
19821985
#include "settings/settings_def_smb_client.h"
@@ -2349,7 +2352,6 @@ static struct config_bool_setting *populate_settings_bool(
23492352
SETTING_BOOL("input_overlay_hide_when_gamepad_connected", &settings->bools.input_overlay_hide_when_gamepad_connected, true, DEFAULT_OVERLAY_HIDE_WHEN_GAMEPAD_CONNECTED, false);
23502353
SETTING_BOOL("input_overlay_show_mouse_cursor", &settings->bools.input_overlay_show_mouse_cursor, true, DEFAULT_OVERLAY_SHOW_MOUSE_CURSOR, false);
23512354
SETTING_BOOL("input_overlay_auto_rotate", &settings->bools.input_overlay_auto_rotate, true, DEFAULT_OVERLAY_AUTO_ROTATE, false);
2352-
SETTING_BOOL("input_overlay_auto_scale", &settings->bools.input_overlay_auto_scale, true, DEFAULT_INPUT_OVERLAY_AUTO_SCALE, false);
23532355
SETTING_BOOL("input_osk_overlay_auto_scale", &settings->bools.input_osk_overlay_auto_scale, true, DEFAULT_INPUT_OVERLAY_AUTO_SCALE, false);
23542356
SETTING_BOOL("input_overlay_pointer_enable", &settings->bools.input_overlay_pointer_enable, true, DEFAULT_INPUT_OVERLAY_POINTER_ENABLE, false);
23552357
SETTING_BOOL("input_overlay_lightgun_trigger_on_touch", &settings->bools.input_overlay_lightgun_trigger_on_touch, true, DEFAULT_INPUT_OVERLAY_LIGHTGUN_TRIGGER_ON_TOUCH, false);
@@ -2505,6 +2507,9 @@ static struct config_float_setting *populate_settings_float(
25052507
#include "settings/settings_def_video_fullscreen.h"
25062508
#define SETTINGS_DEF_CONFIG_PASS
25072509
#include "settings/settings_def_video_sync.h"
2510+
#ifdef HAVE_OVERLAY
2511+
#include "settings/settings_def_overlay_auto_scale.h"
2512+
#endif
25082513
#include "settings/settings_def_notification_widgets.h"
25092514
#ifdef HAVE_SMBCLIENT
25102515
#include "settings/settings_def_smb_client.h"
@@ -2999,6 +3004,9 @@ static struct config_uint_setting *populate_settings_uint(
29993004
#include "settings/settings_def_video_fullscreen.h"
30003005
#define SETTINGS_DEF_CONFIG_PASS
30013006
#include "settings/settings_def_video_sync.h"
3007+
#ifdef HAVE_OVERLAY
3008+
#include "settings/settings_def_overlay_auto_scale.h"
3009+
#endif
30023010
#include "settings/settings_def_notification_widgets.h"
30033011
#ifdef HAVE_SMBCLIENT
30043012
#include "settings/settings_def_smb_client.h"
@@ -3470,6 +3478,9 @@ static struct config_int_setting *populate_settings_int(
34703478
#include "settings/settings_def_video_fullscreen.h"
34713479
#define SETTINGS_DEF_CONFIG_PASS
34723480
#include "settings/settings_def_video_sync.h"
3481+
#ifdef HAVE_OVERLAY
3482+
#include "settings/settings_def_overlay_auto_scale.h"
3483+
#endif
34733484
#include "settings/settings_def_notification_widgets.h"
34743485
#ifdef HAVE_SMBCLIENT
34753486
#include "settings/settings_def_smb_client.h"
@@ -3739,6 +3750,9 @@ static struct config_int_setting *populate_settings_int(
37393750
#include "settings/settings_def_video_fullscreen.h"
37403751
#define SETTINGS_DEF_CONFIG_PASS
37413752
#include "settings/settings_def_video_sync.h"
3753+
#ifdef HAVE_OVERLAY
3754+
#include "settings/settings_def_overlay_auto_scale.h"
3755+
#endif
37423756
#include "settings/settings_def_notification_widgets.h"
37433757
#ifdef HAVE_SMBCLIENT
37443758
#include "settings/settings_def_smb_client.h"

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1840,10 +1840,6 @@ MSG_HASH(
18401840
MENU_ENUM_LABEL_INPUT_OVERLAY_AUTO_ROTATE,
18411841
MENU_ENUM_LABEL_INPUT_OVERLAY_AUTO_ROTATE_STR
18421842
)
1843-
MSG_HASH(
1844-
MENU_ENUM_LABEL_INPUT_OVERLAY_AUTO_SCALE,
1845-
MENU_ENUM_LABEL_INPUT_OVERLAY_AUTO_SCALE_STR
1846-
)
18471843
MSG_HASH(
18481844
MENU_ENUM_LABEL_INPUT_OSK_OVERLAY_AUTO_SCALE,
18491845
MENU_ENUM_LABEL_INPUT_OSK_OVERLAY_AUTO_SCALE_STR

‎intl/msg_hash_us.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
559559
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) n,
560560
#include "../settings/settings_def_video_fullscreen.h"
561561
#include "../settings/settings_def_video_sync.h"
562+
#include "../settings/settings_def_overlay_auto_scale.h"
562563
#include "../settings/settings_def_notification_widgets.h"
563564
#include "../settings/settings_def_smb_client.h"
564565
#include "../settings/settings_def_netplay_stateless.h"
@@ -745,6 +746,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
745746
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
746747
#include "../settings/settings_def_video_fullscreen.h"
747748
#include "../settings/settings_def_video_sync.h"
749+
#include "../settings/settings_def_overlay_auto_scale.h"
748750
#include "../settings/settings_def_notification_widgets.h"
749751
#include "../settings/settings_def_smb_client.h"
750752
#include "../settings/settings_def_netplay_stateless.h"

‎intl/msg_hash_us.h‎

Lines changed: 109 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7421,14 +7421,115 @@ MSG_HASH(
74217421
MENU_ENUM_SUBLABEL_INPUT_OVERLAY_AUTO_ROTATE,
74227422
"If supported by current overlay, automatically rotate layout to match screen orientation/aspect ratio."
74237423
)
7424-
MSG_HASH(
7425-
MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_AUTO_SCALE,
7426-
"Auto-Scale Overlay"
7427-
)
7428-
MSG_HASH(
7429-
MENU_ENUM_SUBLABEL_INPUT_OVERLAY_AUTO_SCALE,
7430-
"Automatically adjust overlay scale and UI element spacing to match screen aspect ratio. Produces best results with controller overlays."
7431-
)
7424+
/* GENERATED REGION: overlay auto-scale setting (see settings_def_overlay_auto_scale.h). */
7425+
#define SETTINGS_DEF_STRINGS_PASS
7426+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
7427+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7428+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7429+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
7430+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7431+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
7432+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7433+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7434+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
7435+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7436+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
7437+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7438+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7439+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
7440+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7441+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
7442+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7443+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7444+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
7445+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7446+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
7447+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7448+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7449+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
7450+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7451+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
7452+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7453+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7454+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
7455+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7456+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
7457+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7458+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7459+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
7460+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7461+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
7462+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7463+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7464+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
7465+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7466+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
7467+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7468+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7469+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
7470+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7471+
#define S_ACTION(T, n, us, sub) \
7472+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7473+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7474+
#define S_ACTION_NS(T, n, us) \
7475+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7476+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
7477+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7478+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7479+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
7480+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7481+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
7482+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7483+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7484+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
7485+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7486+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
7487+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7488+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7489+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
7490+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7491+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
7492+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7493+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7494+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
7495+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7496+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
7497+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7498+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7499+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
7500+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7501+
#include "../settings/settings_def_overlay_auto_scale.h"
7502+
#undef S_BOOL
7503+
#undef S_BOOL_NS
7504+
#undef S_UINT
7505+
#undef S_UINT_NS
7506+
#undef S_INT
7507+
#undef S_INT_NS
7508+
#undef S_FLOAT
7509+
#undef S_FLOAT_NS
7510+
#undef S_STRING
7511+
#undef S_STRING_NS
7512+
#undef S_DIR
7513+
#undef S_DIR_NS
7514+
#undef S_STRING_P
7515+
#undef S_STRING_P_NS
7516+
#undef S_PATH
7517+
#undef S_PATH_NS
7518+
#undef S_PATH_DS
7519+
#undef S_PATH_DS_NS
7520+
#undef S_ACTION
7521+
#undef S_ACTION_NS
7522+
#undef S_BOOL_EX
7523+
#undef S_BOOL_EX_NS
7524+
#undef S_UINT_EX
7525+
#undef S_UINT_EX_NS
7526+
#undef S_INT_EX
7527+
#undef S_INT_EX_NS
7528+
#undef S_FLOAT_EX
7529+
#undef S_FLOAT_EX_NS
7530+
#undef S_ACTION_EX
7531+
#undef S_ACTION_EX_NS
7532+
#undef SETTINGS_DEF_STRINGS_PASS
74327533
MSG_HASH(
74337534
MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_DPAD_DIAGONAL_SENSITIVITY,
74347535
"D-Pad Diagonal Sensitivity"

‎menu/menu_setting.c‎

Lines changed: 92 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18060,9 +18060,98 @@ static bool setting_append_list(
1806018060

1806118061
{
1806218062
static const setting_desc_t ovl_desc_1[] = {
18063-
SDESC_BOOL_ROW_EX(input_overlay_auto_scale, INPUT_OVERLAY_AUTO_SCALE,
18064-
DEFAULT_INPUT_OVERLAY_AUTO_SCALE, SD_FLAG_CMD_APPLY_AUTO, 0, CMD_EVENT_OVERLAY_SET_SCALE_FACTOR,
18065-
setting_bool_action_left_with_refresh, NULL, NULL, NULL, setting_bool_action_left_with_refresh, setting_bool_action_right_with_refresh, 0),
18063+
/* GENERATED: rows come from settings_def_overlay_auto_scale.h in order. */
18064+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
18065+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
18066+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
18067+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
18068+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
18069+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
18070+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
18071+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
18072+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
18073+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
18074+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
18075+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
18076+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
18077+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
18078+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
18079+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
18080+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
18081+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
18082+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
18083+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
18084+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
18085+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
18086+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
18087+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
18088+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
18089+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
18090+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
18091+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
18092+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
18093+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
18094+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
18095+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
18096+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
18097+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
18098+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
18099+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
18100+
#define S_ACTION(T, n, us, sub) \
18101+
SDESC_ACTION_ROW(T),
18102+
#define S_ACTION_NS(T, n, us) \
18103+
SDESC_ACTION_ROW(T),
18104+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
18105+
SDESC_BOOL_ROW_EX(f, T, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui),
18106+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
18107+
SDESC_BOOL_ROW_EX(f, T, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui),
18108+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
18109+
SDESC_UINT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
18110+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
18111+
SDESC_UINT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
18112+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
18113+
SDESC_INT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
18114+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
18115+
SDESC_INT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
18116+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
18117+
SDESC_FLOAT_ROW_EX(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui),
18118+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
18119+
SDESC_FLOAT_ROW_EX(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui),
18120+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
18121+
SDESC_ACTION_ROW_EX(T, sd, ok, rp, c),
18122+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
18123+
SDESC_ACTION_ROW_EX(T, sd, ok, rp, c),
18124+
#include "../settings/settings_def_overlay_auto_scale.h"
18125+
#undef S_BOOL
18126+
#undef S_BOOL_NS
18127+
#undef S_UINT
18128+
#undef S_UINT_NS
18129+
#undef S_INT
18130+
#undef S_INT_NS
18131+
#undef S_FLOAT
18132+
#undef S_FLOAT_NS
18133+
#undef S_STRING
18134+
#undef S_STRING_NS
18135+
#undef S_DIR
18136+
#undef S_DIR_NS
18137+
#undef S_STRING_P
18138+
#undef S_STRING_P_NS
18139+
#undef S_PATH
18140+
#undef S_PATH_NS
18141+
#undef S_PATH_DS
18142+
#undef S_PATH_DS_NS
18143+
#undef S_ACTION
18144+
#undef S_ACTION_NS
18145+
#undef S_BOOL_EX
18146+
#undef S_BOOL_EX_NS
18147+
#undef S_UINT_EX
18148+
#undef S_UINT_EX_NS
18149+
#undef S_INT_EX
18150+
#undef S_INT_EX_NS
18151+
#undef S_FLOAT_EX
18152+
#undef S_FLOAT_EX_NS
18153+
#undef S_ACTION_EX
18154+
#undef S_ACTION_EX_NS
1806618155
};
1806718156
settings_list_add_desc(list, list_info, settings,
1806818157
ovl_desc_1, ARRAY_SIZE(ovl_desc_1),

0 commit comments

Comments
 (0)