Skip to content

Commit f86ae06

Browse files
authored
Ozone: Add horizontal padding factor option (#18022)
1 parent 45c3f93 commit f86ae06

10 files changed

Lines changed: 196 additions & 75 deletions

File tree

config.def.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,6 +662,8 @@
662662
#ifdef HAVE_OZONE
663663
/* Ozone colour theme: 1 == Basic Black */
664664
#define DEFAULT_OZONE_COLOR_THEME 1
665+
#define DEFAULT_OZONE_PADDING_FACTOR 1.0f
666+
#define DEFAULT_OZONE_HEADER_SEPARATOR 1
665667
#define DEFAULT_OZONE_COLLAPSE_SIDEBAR false
666668
#define DEFAULT_OZONE_SCROLL_CONTENT_METADATA false
667669
#define DEFAULT_OZONE_THUMBNAIL_SCALE_FACTOR 1.0f

configuration.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2301,6 +2301,7 @@ static struct config_float_setting *populate_settings_float(
23012301
#endif
23022302
#ifdef HAVE_OZONE
23032303
SETTING_FLOAT("ozone_thumbnail_scale_factor", &settings->floats.ozone_thumbnail_scale_factor, true, DEFAULT_OZONE_THUMBNAIL_SCALE_FACTOR, false);
2304+
SETTING_FLOAT("ozone_padding_factor", &settings->floats.ozone_padding_factor, true, DEFAULT_OZONE_PADDING_FACTOR, false);
23042305
#endif
23052306
#endif /* HAVE_MENU */
23062307

@@ -2447,6 +2448,7 @@ static struct config_uint_setting *populate_settings_uint(
24472448
#endif
24482449
#ifdef HAVE_OZONE
24492450
SETTING_UINT("ozone_menu_color_theme", &settings->uints.menu_ozone_color_theme, true, DEFAULT_OZONE_COLOR_THEME, false);
2451+
SETTING_UINT("ozone_header_separator", &settings->uints.menu_ozone_header_separator, true, DEFAULT_OZONE_HEADER_SEPARATOR, false);
24502452
#endif
24512453
#endif /* HAVE_MENU */
24522454

configuration.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ typedef struct settings
305305
unsigned menu_materialui_thumbnail_view_landscape;
306306
unsigned menu_materialui_landscape_layout_optimization;
307307
unsigned menu_ozone_color_theme;
308+
unsigned menu_ozone_header_separator;
308309
unsigned menu_font_color_red;
309310
unsigned menu_font_color_green;
310311
unsigned menu_font_color_blue;
@@ -417,6 +418,7 @@ typedef struct settings
417418
float menu_ticker_speed;
418419
float menu_rgui_particle_effect_speed;
419420
float menu_screensaver_animation_speed;
421+
float ozone_padding_factor;
420422
float ozone_thumbnail_scale_factor;
421423

422424
float cheevos_appearance_padding_h;

intl/msg_hash_us.h

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12378,6 +12378,34 @@ MSG_HASH(
1237812378
MENU_ENUM_SUBLABEL_OZONE_THUMBNAIL_SCALE_FACTOR,
1237912379
"Scale the size of the thumbnail bar."
1238012380
)
12381+
MSG_HASH(
12382+
MENU_ENUM_LABEL_VALUE_OZONE_PADDING_FACTOR,
12383+
"Padding Factor"
12384+
)
12385+
MSG_HASH(
12386+
MENU_ENUM_SUBLABEL_OZONE_PADDING_FACTOR,
12387+
"Scale the horizontal padding size."
12388+
)
12389+
MSG_HASH(
12390+
MENU_ENUM_LABEL_VALUE_OZONE_HEADER_SEPARATOR,
12391+
"Header Separator"
12392+
)
12393+
MSG_HASH(
12394+
MENU_ENUM_SUBLABEL_OZONE_HEADER_SEPARATOR,
12395+
"Alternative width for header and footer separators."
12396+
)
12397+
MSG_HASH(
12398+
MENU_ENUM_LABEL_VALUE_OZONE_HEADER_SEPARATOR_NONE,
12399+
"None"
12400+
)
12401+
MSG_HASH(
12402+
MENU_ENUM_LABEL_VALUE_OZONE_HEADER_SEPARATOR_NORMAL,
12403+
"Normal"
12404+
)
12405+
MSG_HASH(
12406+
MENU_ENUM_LABEL_VALUE_OZONE_HEADER_SEPARATOR_MAXIMUM,
12407+
"Maximum"
12408+
)
1238112409

1238212410
MSG_HASH(
1238312411
MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,

menu/cbs/menu_cbs_sublabel.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -945,6 +945,8 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_thumbnails_rgui, MENU_
945945
#ifdef HAVE_OZONE
946946
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_left_thumbnails_ozone, MENU_ENUM_SUBLABEL_LEFT_THUMBNAILS_OZONE)
947947
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_ozone_menu_color_theme, MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME)
948+
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_ozone_padding_factor, MENU_ENUM_SUBLABEL_OZONE_PADDING_FACTOR)
949+
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_ozone_header_separator, MENU_ENUM_SUBLABEL_OZONE_HEADER_SEPARATOR)
948950
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_ozone_collapse_sidebar, MENU_ENUM_SUBLABEL_OZONE_COLLAPSE_SIDEBAR)
949951
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_ozone_scroll_content_metadata, MENU_ENUM_SUBLABEL_OZONE_SCROLL_CONTENT_METADATA)
950952
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_ozone_thumbnail_scale_factor, MENU_ENUM_SUBLABEL_OZONE_THUMBNAIL_SCALE_FACTOR)
@@ -3207,6 +3209,16 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
32073209
case MENU_ENUM_LABEL_OZONE_MENU_COLOR_THEME:
32083210
#ifdef HAVE_OZONE
32093211
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_ozone_menu_color_theme);
3212+
#endif
3213+
break;
3214+
case MENU_ENUM_LABEL_OZONE_PADDING_FACTOR:
3215+
#ifdef HAVE_OZONE
3216+
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_ozone_padding_factor);
3217+
#endif
3218+
break;
3219+
case MENU_ENUM_LABEL_OZONE_HEADER_SEPARATOR:
3220+
#ifdef HAVE_OZONE
3221+
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_ozone_header_separator);
32103222
#endif
32113223
break;
32123224
case MENU_ENUM_LABEL_OZONE_COLLAPSE_SIDEBAR:

0 commit comments

Comments
 (0)