Skip to content

Commit 0124db5

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the fullscreen widget scale variant to a single-source def file
The level-variant half of the runtime pair, referencing the plain def for its shared tokens and leaving the shared configuration row with its owner. Performed by tools/settings_migrate_group.py with the standard battery.
1 parent b01b7c8 commit 0124db5

5 files changed

Lines changed: 341 additions & 4 deletions

File tree

‎configuration.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1930,6 +1930,7 @@ static struct config_bool_setting *populate_settings_bool(
19301930
#include "settings/settings_def_video_fullscreen.h"
19311931
#define SETTINGS_DEF_CONFIG_PASS
19321932
#include "settings/settings_def_video_sync.h"
1933+
#include "settings/settings_def_widget_scale_fullscreen.h"
19331934
#ifdef HAVE_MENU
19341935
#include "settings/settings_def_widget_scale.h"
19351936
#endif
@@ -2615,6 +2616,7 @@ static struct config_float_setting *populate_settings_float(
26152616
#include "settings/settings_def_video_fullscreen.h"
26162617
#define SETTINGS_DEF_CONFIG_PASS
26172618
#include "settings/settings_def_video_sync.h"
2619+
#include "settings/settings_def_widget_scale_fullscreen.h"
26182620
#ifdef HAVE_MENU
26192621
#include "settings/settings_def_widget_scale.h"
26202622
#endif
@@ -3257,6 +3259,7 @@ static struct config_uint_setting *populate_settings_uint(
32573259
#include "settings/settings_def_video_fullscreen.h"
32583260
#define SETTINGS_DEF_CONFIG_PASS
32593261
#include "settings/settings_def_video_sync.h"
3262+
#include "settings/settings_def_widget_scale_fullscreen.h"
32603263
#ifdef HAVE_MENU
32613264
#include "settings/settings_def_widget_scale.h"
32623265
#endif
@@ -3933,6 +3936,7 @@ static struct config_int_setting *populate_settings_int(
39333936
#include "settings/settings_def_video_fullscreen.h"
39343937
#define SETTINGS_DEF_CONFIG_PASS
39353938
#include "settings/settings_def_video_sync.h"
3939+
#include "settings/settings_def_widget_scale_fullscreen.h"
39363940
#ifdef HAVE_MENU
39373941
#include "settings/settings_def_widget_scale.h"
39383942
#endif
@@ -4497,6 +4501,7 @@ static struct config_int_setting *populate_settings_int(
44974501
#include "settings/settings_def_video_fullscreen.h"
44984502
#define SETTINGS_DEF_CONFIG_PASS
44994503
#include "settings/settings_def_video_sync.h"
4504+
#include "settings/settings_def_widget_scale_fullscreen.h"
45004505
#ifdef HAVE_MENU
45014506
#include "settings/settings_def_widget_scale.h"
45024507
#endif

‎intl/msg_hash_us.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
567567
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) n,
568568
#include "../settings/settings_def_video_fullscreen.h"
569569
#include "../settings/settings_def_video_sync.h"
570+
#include "../settings/settings_def_widget_scale_fullscreen.h"
570571
#include "../settings/settings_def_widget_scale.h"
571572
#include "../settings/settings_def_cheevos_account.h"
572573
#include "../settings/settings_def_menu_show_restart.h"
@@ -918,6 +919,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
918919
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
919920
#include "../settings/settings_def_video_fullscreen.h"
920921
#include "../settings/settings_def_video_sync.h"
922+
#include "../settings/settings_def_widget_scale_fullscreen.h"
921923
#include "../settings/settings_def_widget_scale.h"
922924
#include "../settings/settings_def_cheevos_account.h"
923925
#include "../settings/settings_def_menu_show_restart.h"

‎intl/msg_hash_us.h‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34965,3 +34965,170 @@ MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3496534965
#undef S_ACTION_LV_H
3496634966
#undef S_ACTION_LV_NS_H
3496734967
#undef SETTINGS_DEF_STRINGS_PASS
34968+
/* GENERATED REGION: fullscreen widget scale variant (see settings_def_widget_scale_fullscreen.h). */
34969+
#define SETTINGS_DEF_STRINGS_PASS
34970+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
34971+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34972+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34973+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
34974+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34975+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
34976+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34977+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34978+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
34979+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34980+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
34981+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34982+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34983+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
34984+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34985+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
34986+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34987+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34988+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
34989+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34990+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34991+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34992+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34993+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
34994+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34995+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
34996+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34997+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34998+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
34999+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35000+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35001+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35002+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35003+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
35004+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35005+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
35006+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35007+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35008+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
35009+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35010+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
35011+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35012+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35013+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
35014+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35015+
#define S_ACTION(T, n, us, sub) \
35016+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35017+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35018+
#define S_ACTION_NS(T, n, us) \
35019+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35020+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35021+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35022+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35023+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
35024+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35025+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35026+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35027+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35028+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
35029+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35030+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35031+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35032+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35033+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
35034+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35035+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35036+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35037+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35038+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
35039+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35040+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
35041+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
35042+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35043+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
35044+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35045+
#define S_BOOL_LV(f, T, TV, n, d, sd, df, c, us, sub) \
35046+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35047+
#define S_BOOL_LV_NS(f, T, TV, n, d, sd, df, c, us)
35048+
#define S_FLOAT_LV(f, T, TV, n, d, rnd, sd, df, c, us, sub) \
35049+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35050+
#define S_FLOAT_LV_NS(f, T, TV, n, d, rnd, sd, df, c, us)
35051+
#define S_STRING_LV(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
35052+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35053+
#define S_STRING_LV_NS(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us)
35054+
#define S_ACTION_LV(T, TV, n, sd, ok, rp, c, us, sub) \
35055+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
35056+
#define S_ACTION_LV_NS(T, TV, n, sd, ok, rp, c, us)
35057+
#include "../settings/settings_def_widget_scale_fullscreen.h"
35058+
#undef S_BOOL
35059+
#undef S_BOOL_NS
35060+
#undef S_BOOL_H
35061+
#undef S_BOOL_NS_H
35062+
#undef S_UINT
35063+
#undef S_UINT_NS
35064+
#undef S_UINT_H
35065+
#undef S_UINT_NS_H
35066+
#undef S_INT
35067+
#undef S_INT_NS
35068+
#undef S_INT_H
35069+
#undef S_INT_NS_H
35070+
#undef S_FLOAT
35071+
#undef S_FLOAT_NS
35072+
#undef S_FLOAT_H
35073+
#undef S_FLOAT_NS_H
35074+
#undef S_STRING
35075+
#undef S_STRING_NS
35076+
#undef S_STRING_H
35077+
#undef S_STRING_NS_H
35078+
#undef S_DIR
35079+
#undef S_DIR_NS
35080+
#undef S_DIR_H
35081+
#undef S_DIR_NS_H
35082+
#undef S_STRING_P
35083+
#undef S_STRING_P_NS
35084+
#undef S_STRING_P_H
35085+
#undef S_STRING_P_NS_H
35086+
#undef S_PATH
35087+
#undef S_PATH_NS
35088+
#undef S_PATH_H
35089+
#undef S_PATH_NS_H
35090+
#undef S_PATH_DS
35091+
#undef S_PATH_DS_NS
35092+
#undef S_PATH_DS_H
35093+
#undef S_PATH_DS_NS_H
35094+
#undef S_ACTION
35095+
#undef S_ACTION_NS
35096+
#undef S_ACTION_H
35097+
#undef S_ACTION_NS_H
35098+
#undef S_BOOL_EX
35099+
#undef S_BOOL_EX_NS
35100+
#undef S_BOOL_EX_H
35101+
#undef S_BOOL_EX_NS_H
35102+
#undef S_UINT_EX
35103+
#undef S_UINT_EX_NS
35104+
#undef S_UINT_EX_H
35105+
#undef S_UINT_EX_NS_H
35106+
#undef S_INT_EX
35107+
#undef S_INT_EX_NS
35108+
#undef S_INT_EX_H
35109+
#undef S_INT_EX_NS_H
35110+
#undef S_FLOAT_EX
35111+
#undef S_FLOAT_EX_NS
35112+
#undef S_FLOAT_EX_H
35113+
#undef S_FLOAT_EX_NS_H
35114+
#undef S_ACTION_EX
35115+
#undef S_ACTION_EX_NS
35116+
#undef S_ACTION_EX_H
35117+
#undef S_ACTION_EX_NS_H
35118+
#undef S_BOOL_LV
35119+
#undef S_BOOL_LV_NS
35120+
#undef S_BOOL_LV_H
35121+
#undef S_BOOL_LV_NS_H
35122+
#undef S_FLOAT_LV
35123+
#undef S_FLOAT_LV_NS
35124+
#undef S_FLOAT_LV_H
35125+
#undef S_FLOAT_LV_NS_H
35126+
#undef S_STRING_LV
35127+
#undef S_STRING_LV_NS
35128+
#undef S_STRING_LV_H
35129+
#undef S_STRING_LV_NS_H
35130+
#undef S_ACTION_LV
35131+
#undef S_ACTION_LV_NS
35132+
#undef S_ACTION_LV_H
35133+
#undef S_ACTION_LV_NS_H
35134+
#undef SETTINGS_DEF_STRINGS_PASS

‎menu/menu_setting.c‎

Lines changed: 154 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24599,10 +24599,160 @@ static bool setting_append_list(
2459924599
#else
2460024600
{
2460124601
static const setting_desc_t widget_fs_desc[] = {
24602-
SDESC_FLOAT_ROW_LV(menu_widget_scale_factor, MENU_WIDGET_SCALE_FACTOR,
24603-
MENU_WIDGET_SCALE_FACTOR_FULLSCREEN,
24604-
DEFAULT_MENU_WIDGET_SCALE_FACTOR, "%.2fx",
24605-
SD_FLAG_NONE, 0, 0)
24602+
/* GENERATED: rows come from settings_def_widget_scale_fullscreen.h in order. */
24603+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
24604+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
24605+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
24606+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
24607+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
24608+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
24609+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
24610+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
24611+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
24612+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
24613+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
24614+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
24615+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
24616+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
24617+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
24618+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
24619+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
24620+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
24621+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
24622+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
24623+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
24624+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
24625+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
24626+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
24627+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
24628+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
24629+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
24630+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
24631+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
24632+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
24633+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
24634+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
24635+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
24636+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
24637+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
24638+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
24639+
#define S_ACTION(T, n, us, sub) \
24640+
SDESC_ACTION_ROW(T),
24641+
#define S_ACTION_NS(T, n, us) \
24642+
SDESC_ACTION_ROW(T),
24643+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
24644+
SDESC_BOOL_ROW_EX(f, T, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui),
24645+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
24646+
SDESC_BOOL_ROW_EX(f, T, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui),
24647+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
24648+
SDESC_UINT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
24649+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
24650+
SDESC_UINT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
24651+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
24652+
SDESC_INT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
24653+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
24654+
SDESC_INT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
24655+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
24656+
SDESC_FLOAT_ROW_EX(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui),
24657+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
24658+
SDESC_FLOAT_ROW_EX(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui),
24659+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
24660+
SDESC_ACTION_ROW_EX(T, sd, ok, rp, c),
24661+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
24662+
SDESC_ACTION_ROW_EX(T, sd, ok, rp, c),
24663+
#define S_BOOL_LV(f, T, TV, n, d, sd, df, c, us, sub) \
24664+
SDESC_BOOL_ROW_LV(f, T, TV, d, sd, df, c),
24665+
#define S_BOOL_LV_NS(f, T, TV, n, d, sd, df, c, us) \
24666+
SDESC_BOOL_ROW_LV(f, T, TV, d, sd, df, c),
24667+
#define S_FLOAT_LV(f, T, TV, n, d, rnd, sd, df, c, us, sub) \
24668+
SDESC_FLOAT_ROW_LV(f, T, TV, d, rnd, sd, df, c),
24669+
#define S_FLOAT_LV_NS(f, T, TV, n, d, rnd, sd, df, c, us) \
24670+
SDESC_FLOAT_ROW_LV(f, T, TV, d, rnd, sd, df, c),
24671+
#define S_STRING_LV(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
24672+
SDESC_STRING_ROW_LV(f, T, TV, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
24673+
#define S_STRING_LV_NS(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
24674+
SDESC_STRING_ROW_LV(f, T, TV, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
24675+
#define S_ACTION_LV(T, TV, n, sd, ok, rp, c, us, sub) \
24676+
SDESC_ACTION_ROW_LV(T, TV, sd, ok, rp, c),
24677+
#define S_ACTION_LV_NS(T, TV, n, sd, ok, rp, c, us) \
24678+
SDESC_ACTION_ROW_LV(T, TV, sd, ok, rp, c),
24679+
#include "../settings/settings_def_widget_scale_fullscreen.h"
24680+
#undef S_BOOL
24681+
#undef S_BOOL_NS
24682+
#undef S_BOOL_H
24683+
#undef S_BOOL_NS_H
24684+
#undef S_UINT
24685+
#undef S_UINT_NS
24686+
#undef S_UINT_H
24687+
#undef S_UINT_NS_H
24688+
#undef S_INT
24689+
#undef S_INT_NS
24690+
#undef S_INT_H
24691+
#undef S_INT_NS_H
24692+
#undef S_FLOAT
24693+
#undef S_FLOAT_NS
24694+
#undef S_FLOAT_H
24695+
#undef S_FLOAT_NS_H
24696+
#undef S_STRING
24697+
#undef S_STRING_NS
24698+
#undef S_STRING_H
24699+
#undef S_STRING_NS_H
24700+
#undef S_DIR
24701+
#undef S_DIR_NS
24702+
#undef S_DIR_H
24703+
#undef S_DIR_NS_H
24704+
#undef S_STRING_P
24705+
#undef S_STRING_P_NS
24706+
#undef S_STRING_P_H
24707+
#undef S_STRING_P_NS_H
24708+
#undef S_PATH
24709+
#undef S_PATH_NS
24710+
#undef S_PATH_H
24711+
#undef S_PATH_NS_H
24712+
#undef S_PATH_DS
24713+
#undef S_PATH_DS_NS
24714+
#undef S_PATH_DS_H
24715+
#undef S_PATH_DS_NS_H
24716+
#undef S_ACTION
24717+
#undef S_ACTION_NS
24718+
#undef S_ACTION_H
24719+
#undef S_ACTION_NS_H
24720+
#undef S_BOOL_EX
24721+
#undef S_BOOL_EX_NS
24722+
#undef S_BOOL_EX_H
24723+
#undef S_BOOL_EX_NS_H
24724+
#undef S_UINT_EX
24725+
#undef S_UINT_EX_NS
24726+
#undef S_UINT_EX_H
24727+
#undef S_UINT_EX_NS_H
24728+
#undef S_INT_EX
24729+
#undef S_INT_EX_NS
24730+
#undef S_INT_EX_H
24731+
#undef S_INT_EX_NS_H
24732+
#undef S_FLOAT_EX
24733+
#undef S_FLOAT_EX_NS
24734+
#undef S_FLOAT_EX_H
24735+
#undef S_FLOAT_EX_NS_H
24736+
#undef S_ACTION_EX
24737+
#undef S_ACTION_EX_NS
24738+
#undef S_ACTION_EX_H
24739+
#undef S_ACTION_EX_NS_H
24740+
#undef S_BOOL_LV
24741+
#undef S_BOOL_LV_NS
24742+
#undef S_BOOL_LV_H
24743+
#undef S_BOOL_LV_NS_H
24744+
#undef S_FLOAT_LV
24745+
#undef S_FLOAT_LV_NS
24746+
#undef S_FLOAT_LV_H
24747+
#undef S_FLOAT_LV_NS_H
24748+
#undef S_STRING_LV
24749+
#undef S_STRING_LV_NS
24750+
#undef S_STRING_LV_H
24751+
#undef S_STRING_LV_NS_H
24752+
#undef S_ACTION_LV
24753+
#undef S_ACTION_LV_NS
24754+
#undef S_ACTION_LV_H
24755+
#undef S_ACTION_LV_NS_H
2460624756
};
2460724757
settings_list_add_desc(list, list_info, settings,
2460824758
widget_fs_desc, ARRAY_SIZE(widget_fs_desc),

0 commit comments

Comments
 (0)