mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-15 18:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename menu widgets to display widgets

Browse Source
This commit is contained in:
twinaphex 2020-03-13 03:56:51 +01:00
parent 0aecf033b6
commit 7986561598
8 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cheevos-new/cheevos.c
View File

@ -2532,7 +2532,7 @@ found:
*************************************************************************/
CORO_SUB(RCHEEVOS_GET_BADGES)
/* we always want badges if menu widgets are enabled */
/* we always want badges if display widgets are enabled */
#if !defined(HAVE_GFX_WIDGETS)
{
settings_t *settings = config_get_ptr();

10
config.def.h
View File

@ -978,16 +978,16 @@ static const unsigned playlist_entry_remove_enable = PLAYLIST_ENTRY_REMOVE_ENABL
/* Show Menu start-up screen on boot. */
#define DEFAULT_MENU_SHOW_START_SCREEN true
/* Default scale factor for non-frambuffer-based menu
* drivers and menu widgets */
/* Default scale factor for non-frambuffer-based display
* drivers and display widgets */
#define DEFAULT_MENU_SCALE_FACTOR 1.0f
/* Specifies whether menu widgets should be scaled
/* Specifies whether display widgets should be scaled
* automatically using the default menu scale factor */
#define DEFAULT_MENU_WIDGET_SCALE_AUTO true
/* Default scale factor for menu widgets when widget
/* Default scale factor for display widgets when widget
* auto scaling is disabled (fullscreen mode) */
#define DEFAULT_MENU_WIDGET_SCALE_FACTOR 1.0f
/* Default scale factor for menu widgets when widget
/* Default scale factor for display widgets when widget
* auto scaling is disabled (windowed mode) */
#define DEFAULT_MENU_WIDGET_SCALE_FACTOR_WINDOWED 1.0f

4
gfx/common/metal_common.m
View File

@ -156,7 +156,7 @@
*input = NULL;
*inputData = NULL;
// menu display
// graphics display driver
_display = [[MenuDisplay alloc] initWithContext:_context];
// menu view
@ -340,7 +340,7 @@
#ifdef HAVE_GFX_WIDGETS
if (widgets_active)
{
[rce pushDebugGroup:@"menu widgets"];
[rce pushDebugGroup:@"display widgets"];
gfx_widgets_frame(video_info);
[rce popDebugGroup];
}

6
intl/msg_hash_us.h
View File

@ -942,7 +942,7 @@ MSG_HASH(
)
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."
"Applies a manual scaling factor override when drawing display 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,
@ -950,7 +950,7 @@ MSG_HASH(
)
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."
"Applies a manual scaling factor override when drawing display 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(
MENU_ENUM_LABEL_VALUE_MENU_WIDGET_SCALE_FACTOR_WINDOWED,
@ -958,7 +958,7 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_SUBLABEL_MENU_WIDGET_SCALE_FACTOR_WINDOWED,
"Applies a manual scaling factor override when drawing menu widgets in windowed 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."
"Applies a manual scaling factor override when drawing display widgets in windowed 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(
MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,

2
menu/drivers/rgui.c
View File

@ -4337,7 +4337,7 @@ static void *rgui_init(void **userdata, bool video_is_threaded)
* platforms do not like video_driver_texture-related
* operations (e.g. 3DS). We would hope that these
* platforms will always have HAVE_GFX_WIDGETS disabled,
* but for extra safety we will only permit menu widget
* but for extra safety we will only permit display widget
* additions when the current gfx driver reports that it
* has widget support */
rgui->widgets_supported = gfx_widgets_ready();

16
retroarch.c
View File

@ -6148,7 +6148,7 @@ static void handle_translation_cb(
video_driver_cached_frame_get(&dummy_data, &width, &height, &pitch);
/* try two different modes for text display *
* In the first mode, we use menu widget overlays, but they require
* In the first mode, we use display widget overlays, but they require
* the video poke interface to be able to load image buffers.
*
* The other method is to draw to the video buffer directly, which needs
@ -6198,7 +6198,7 @@ static void handle_translation_cb(
}
else
#endif
/* Can't use menu widget overlays, so try writing to video buffer */
/* Can't use display widget overlays, so try writing to video buffer */
{
/* Write to video buffer directly (software cores only) */
if (raw_image_file_data[0] == 'B' && raw_image_file_data[1] == 'M')
@ -8108,7 +8108,8 @@ bool command_event(enum event_command cmd, void *data)
#if defined(HAVE_TRANSLATE) && defined(HAVE_GFX_WIDGETS)
if (gfx_widgets_ai_service_overlay_get_state() != 0)
{
/* Because the overlay is a menu widget, it's going to be written
/* Because the overlay is a display widget,
* it's going to be written
* over the menu, so we unset it here. */
gfx_widgets_ai_service_overlay_unload();
}
@ -9711,7 +9712,7 @@ void main_exit(void *args)
command_event(CMD_EVENT_MENU_SAVE_CURRENT_CONFIG, NULL);
#if defined(HAVE_GFX_WIDGETS)
/* Do not want menu widgets to live any more. */
/* Do not want display widgets to live any more. */
gfx_widgets_set_persistence(false);
#endif
#ifdef HAVE_MENU
@ -25297,7 +25298,7 @@ static void drivers_init(int flags)
bool menu_enable_widgets = settings->bools.menu_enable_widgets;
#if defined(HAVE_GFX_WIDGETS)
/* By default, we want menu widgets to persist through driver reinits. */
/* By default, we want display widgets to persist through driver reinits. */
gfx_widgets_set_persistence(true);
#endif
@ -25527,7 +25528,7 @@ static void driver_uninit(int flags)
static void retroarch_deinit_drivers(void)
{
#if defined(HAVE_GFX_WIDGETS)
/* Tear down menu widgets no matter what
/* Tear down display widgets no matter what
* in case the handle is lost in the threaded
* video driver in the meantime
* (breaking video_driver_has_widgets) */
@ -29657,7 +29658,8 @@ static enum runloop_state runloop_check_state(retro_time_t current_time)
old_button_state = new_button_state;
old_hold_button_state = new_hold_button_state;
/* Show the fast-forward OSD for 1 frame every frame if menu widgets are disabled */
/* Show the fast-forward OSD for 1 frame every frame if
* display widgets are disabled */
#if defined(HAVE_GFX_WIDGETS)
if (!widgets_active && runloop_fastmotion)
#else

2
retroarch.h
View File

@ -1502,7 +1502,7 @@ typedef struct video_driver
unsigned (*wrap_type_to_enum)(enum gfx_wrap_type type);
#if defined(HAVE_GFX_WIDGETS)
/* if set to true, will use menu widgets when applicable
/* if set to true, will use display widgets when applicable
* if set to false, will use OSD as a fallback */
bool (*gfx_widgets_enabled)(void *data);
#endif

2
tasks/task_screenshot.c
View File

@ -159,7 +159,7 @@ static void task_screenshot_handler(retro_task_t *task)
free(state->userbuf);
#if defined(HAVE_GFX_WIDGETS)
/* If menu widgets are enabled, state is freed
/* If display widgets are enabled, state is freed
in the callback after the notification
is displayed */
if (!state->widgets_ready)