diff --git a/configuration.c b/configuration.c index 689a6d54dd..16c09734fc 100644 --- a/configuration.c +++ b/configuration.c @@ -1699,7 +1699,9 @@ static struct config_float_setting *populate_settings_float(settings_t *settings #ifdef HAVE_MENU SETTING_FLOAT("menu_scale_factor", &settings->floats.menu_scale_factor, true, DEFAULT_MENU_SCALE_FACTOR, false); SETTING_FLOAT("menu_widget_scale_factor", &settings->floats.menu_widget_scale_factor, true, DEFAULT_MENU_WIDGET_SCALE_FACTOR, false); +#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)) SETTING_FLOAT("menu_widget_scale_factor_windowed", &settings->floats.menu_widget_scale_factor_windowed, true, DEFAULT_MENU_WIDGET_SCALE_FACTOR_WINDOWED, false); +#endif SETTING_FLOAT("menu_wallpaper_opacity", &settings->floats.menu_wallpaper_opacity, true, menu_wallpaper_opacity, false); SETTING_FLOAT("menu_framebuffer_opacity", &settings->floats.menu_framebuffer_opacity, true, menu_framebuffer_opacity, false); SETTING_FLOAT("menu_footer_opacity", &settings->floats.menu_footer_opacity, true, menu_footer_opacity, false); diff --git a/gfx/gfx_display.c b/gfx/gfx_display.c index 65d770f135..36b9d32b5d 100644 --- a/gfx/gfx_display.c +++ b/gfx/gfx_display.c @@ -428,10 +428,14 @@ float gfx_display_get_widget_dpi_scale( settings_t *settings = config_get_ptr(); bool gfx_widget_scale_auto = settings->bools.menu_widget_scale_auto; float _menu_scale_factor = settings->floats.menu_scale_factor; +#if (defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)) + float menu_widget_scale_factor = settings->floats.menu_widget_scale_factor; +#else float menu_widget_scale_factor_fullscreen = settings->floats.menu_widget_scale_factor; float menu_widget_scale_factor_windowed = settings->floats.menu_widget_scale_factor_windowed; float menu_widget_scale_factor = fullscreen ? menu_widget_scale_factor_fullscreen : menu_widget_scale_factor_windowed; +#endif gfx_display_t *p_disp = disp_get_ptr(); /* When using RGUI, _menu_scale_factor @@ -488,10 +492,14 @@ float gfx_display_get_widget_pixel_scale( settings_t *settings = config_get_ptr(); bool gfx_widget_scale_auto = settings->bools.menu_widget_scale_auto; float _menu_scale_factor = settings->floats.menu_scale_factor; +#if (defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)) + float menu_widget_scale_factor = settings->floats.menu_widget_scale_factor; +#else float menu_widget_scale_factor_fullscreen = settings->floats.menu_widget_scale_factor; float menu_widget_scale_factor_windowed = settings->floats.menu_widget_scale_factor_windowed; float menu_widget_scale_factor = fullscreen ? menu_widget_scale_factor_fullscreen : menu_widget_scale_factor_windowed; +#endif gfx_display_t *p_disp = disp_get_ptr(); /* When using RGUI, _menu_scale_factor is ignored diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 6dae6bda2c..634a8afbba 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -934,10 +934,18 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR, - "Remplacement de l'échelle des widgets graphiques (Plein écran)" + "Remplacement de l'échelle des widgets graphiques" ) MSG_HASH( MENU_ENUM_SUBLABEL_MENU_WIDGET_SCALE_FACTOR, + "Applique une valeur manuelle de remplacement du facteur d'échelle pour l'affichage des widgets graphiques. Cette valeur est appliquée uniquement si l'option 'Mise à l'échelle automatique des widgets graphiques' est désactivée. Peut être utile pour augmenter ou réduire la taille des notifications améliorées, indicateurs et commandes indépendamment du menu lui-même." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR_FULLSCREEN, + "Remplacement de l'échelle des widgets graphiques (Plein écran)" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_MENU_WIDGET_SCALE_FACTOR_FULLSCREEN, "Applique une valeur manuelle de remplacement du facteur d'échelle pour l'affichage des widgets graphiques en mode plein écran. Cette valeur est appliquée uniquement si l'option 'Mise à l'échelle automatique des widgets graphiques' est désactivée. Peut être utile pour augmenter ou réduire la taille des notifications améliorées, indicateurs et commandes indépendamment du menu lui-même." ) MSG_HASH( diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index d1473fded1..1955e0c5e3 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -938,10 +938,18 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR, - "Substituição da escala dos widgets gráficos (tela cheia)" + "Substituição da escala dos widgets gráficos" ) MSG_HASH( MENU_ENUM_SUBLABEL_MENU_WIDGET_SCALE_FACTOR, + "Aplica uma substituição manual da escala ao desenhar os widgets do menu. Aplica-se apenas quando 'Escala automática nos widgets gráficos' está desativado. Pode ser usado para aumentar ou diminuir o tamanho das notificações, indicadores e controles decorados independentemente do próprio menu." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR_FULLSCREEN, + "Substituição da escala dos widgets gráficos (tela cheia)" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_MENU_WIDGET_SCALE_FACTOR_FULLSCREEN, "Aplica uma substituição manual da escala ao desenhar os widgets do menu no modo de tela cheia. Aplica-se apenas quando 'Escala automática nos widgets gráficos' está desativado. Pode ser usado para aumentar ou diminuir o tamanho das notificações, indicadores e controles decorados independentemente do próprio menu." ) MSG_HASH( diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 26710329e0..59d273affa 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -938,10 +938,18 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR, - "Graphics Widgets Scale Override (Fullscreen)" + "Graphics Widgets Scale Override" ) MSG_HASH( MENU_ENUM_SUBLABEL_MENU_WIDGET_SCALE_FACTOR, + "Applies a manual scaling factor override when drawing menu widgets. Only applies when 'Auto Scale Graphics Widgets' is disabled. Can be used to increase or decrease the size of decorated notifications, indicators and controls independently from the menu itself." + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR_FULLSCREEN, + "Graphics Widgets Scale Override (Fullscreen)" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_MENU_WIDGET_SCALE_FACTOR_FULLSCREEN, "Applies a manual scaling factor override when drawing menu widgets in fullscreen mode. Only applies when 'Auto Scale Graphics Widgets' is disabled. Can be used to increase or decrease the size of decorated notifications, indicators and controls independently from the menu itself." ) MSG_HASH( diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index cdd4aa31e6..041f521021 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -546,8 +546,12 @@ default_sublabel_macro(action_bind_sublabel_materialui_menu_thumbnail_view_lands default_sublabel_macro(action_bind_sublabel_menu_use_preferred_system_color_theme, MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME) default_sublabel_macro(action_bind_sublabel_menu_scale_factor, MENU_ENUM_SUBLABEL_MENU_SCALE_FACTOR) default_sublabel_macro(action_bind_sublabel_menu_widget_scale_auto, MENU_ENUM_SUBLABEL_MENU_WIDGET_SCALE_AUTO) +#if (defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)) default_sublabel_macro(action_bind_sublabel_menu_widget_scale_factor, MENU_ENUM_SUBLABEL_MENU_WIDGET_SCALE_FACTOR) +#else +default_sublabel_macro(action_bind_sublabel_menu_widget_scale_factor, MENU_ENUM_SUBLABEL_MENU_WIDGET_SCALE_FACTOR_FULLSCREEN) default_sublabel_macro(action_bind_sublabel_menu_widget_scale_factor_windowed, MENU_ENUM_SUBLABEL_MENU_WIDGET_SCALE_FACTOR_WINDOWED) +#endif default_sublabel_macro(action_bind_sublabel_menu_wallpaper_opacity, MENU_ENUM_SUBLABEL_MENU_WALLPAPER_OPACITY) default_sublabel_macro(action_bind_sublabel_menu_framebuffer_opacity, MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY) default_sublabel_macro(action_bind_sublabel_menu_horizontal_animation, MENU_ENUM_SUBLABEL_MENU_HORIZONTAL_ANIMATION) @@ -1805,9 +1809,11 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_widget_scale_factor); break; +#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)) case MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR_WINDOWED: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_widget_scale_factor_windowed); break; +#endif case MENU_ENUM_LABEL_MENU_WALLPAPER_OPACITY: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_wallpaper_opacity); break; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index ae4038fcee..315b9a89ef 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -6599,7 +6599,9 @@ unsigned menu_displaylist_build_list( {MENU_ENUM_LABEL_MENU_WIDGETS_ENABLE, PARSE_ONLY_BOOL, true }, {MENU_ENUM_LABEL_MENU_WIDGET_SCALE_AUTO, PARSE_ONLY_BOOL, false }, {MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR, PARSE_ONLY_FLOAT, false }, +#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)) {MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR_WINDOWED, PARSE_ONLY_FLOAT, false }, +#endif {MENU_ENUM_LABEL_FPS_SHOW, PARSE_ONLY_BOOL, false }, {MENU_ENUM_LABEL_FPS_UPDATE_INTERVAL, PARSE_ONLY_UINT, false }, {MENU_ENUM_LABEL_FRAMECOUNT_SHOW, PARSE_ONLY_BOOL, false }, @@ -6649,6 +6651,7 @@ unsigned menu_displaylist_build_list( build_list[i].checked = true; #endif break; +#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)) case MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR_WINDOWED: #ifdef HAVE_GFX_WIDGETS if (menu_enable_widgets) @@ -6656,6 +6659,7 @@ unsigned menu_displaylist_build_list( build_list[i].checked = true; #endif break; +#endif default: if (video_font_enable) build_list[i].checked = true; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 6a60676d7a..1880ad3c7e 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -11913,7 +11913,11 @@ static bool setting_append_list( list, list_info, &settings->floats.menu_widget_scale_factor, MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR, +#if (defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)) MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR, +#else + MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR_FULLSCREEN, +#endif DEFAULT_MENU_WIDGET_SCALE_FACTOR, "%.2fx", &group_info, @@ -11924,6 +11928,7 @@ static bool setting_append_list( (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; menu_settings_list_current_add_range(list, list_info, 0.2, 5.0, 0.01, true, true); +#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)) CONFIG_FLOAT( list, list_info, &settings->floats.menu_widget_scale_factor_windowed, @@ -11938,6 +11943,8 @@ static bool setting_append_list( general_read_handler); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; menu_settings_list_current_add_range(list, list_info, 0.2, 5.0, 0.01, true, true); +#endif + #endif CONFIG_BOOL( diff --git a/msg_hash.h b/msg_hash.h index b3b523d1ac..dfbe856ac7 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -520,6 +520,7 @@ enum msg_hash_enums MENU_LABEL(MENU_SCALE_FACTOR), MENU_LABEL(MENU_WIDGET_SCALE_AUTO), MENU_LABEL(MENU_WIDGET_SCALE_FACTOR), + MENU_LABEL(MENU_WIDGET_SCALE_FACTOR_FULLSCREEN), MENU_LABEL(MENU_WIDGET_SCALE_FACTOR_WINDOWED), MENU_LABEL(MENU_WALLPAPER_OPACITY), MENU_LABEL(MENU_FRAMEBUFFER_OPACITY), diff --git a/ui/drivers/qt/options/osd.cpp b/ui/drivers/qt/options/osd.cpp index f5212653f5..3eba769e9a 100644 --- a/ui/drivers/qt/options/osd.cpp +++ b/ui/drivers/qt/options/osd.cpp @@ -55,7 +55,9 @@ QWidget *NotificationsPage::widget() notificationsGroup->add(MENU_ENUM_LABEL_MENU_WIDGETS_ENABLE); notificationsGroup->add(MENU_ENUM_LABEL_MENU_WIDGET_SCALE_AUTO); notificationsGroup->add(MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR); +#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)) notificationsGroup->add(MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR_WINDOWED); +#endif layout->addWidget(notificationsGroup);