ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

autoconf cleanups, fix swap ok/cancel in ozone

This commit is contained in:
radius 2019-05-28 09:26:09 -05:00 committed by twinaphex
parent d8c4c4e276
commit 1704ef8410
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/drivers/ozone/ozone.c
View File

@ -1148,8 +1148,8 @@ static void ozone_draw_footer(ozone_handle_t *ozone, video_frame_info_t *video_i
if (do_swap) if (do_swap)
{ {
ozone_draw_icon(video_info, icon_size, icon_size, ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_R], video_info->width - 138, video_info->height - ozone->dimensions.footer_height / 2 - icon_offset, video_info->width,video_info->height, 0, 1, ozone->theme_dynamic.entries_icon); ozone_draw_icon(video_info, icon_size, icon_size, ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_D], video_info->width - 138, video_info->height - ozone->dimensions.footer_height / 2 - icon_offset, video_info->width,video_info->height, 0, 1, ozone->theme_dynamic.entries_icon);
ozone_draw_icon(video_info, icon_size, icon_size, ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_D], video_info->width - 256, video_info->height - ozone->dimensions.footer_height / 2 - icon_offset, video_info->width,video_info->height, 0, 1, ozone->theme_dynamic.entries_icon); ozone_draw_icon(video_info, icon_size, icon_size, ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_R], video_info->width - 256, video_info->height - ozone->dimensions.footer_height / 2 - icon_offset, video_info->width,video_info->height, 0, 1, ozone->theme_dynamic.entries_icon);
} }
else else
{ {

1
menu/menu_input.c
View File

@ -35,6 +35,7 @@
#include "../configuration.h" #include "../configuration.h"
#include "../retroarch.h" #include "../retroarch.h"
#include "../verbosity.h"
#include "../performance_counters.h" #include "../performance_counters.h"
#include "../tasks/tasks_internal.h" #include "../tasks/tasks_internal.h"

4
tasks/task_autodetect.c
View File

@ -247,7 +247,7 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
snprintf(msg, sizeof(msg), "%s configured.", snprintf(msg, sizeof(msg), "%s configured.",
(string_is_empty(display_name) && (string_is_empty(display_name) &&
!string_is_empty(params->name)) ? params->name : (!string_is_empty(display_name) ? display_name : "N/A")); !string_is_empty(params->name)) ? params->name : (!string_is_empty(display_name) ? display_name : "N/A"));
if (!remote_is_bound) if (!remote_is_bound)
{ {
@ -263,7 +263,7 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
bool tmp = false; bool tmp = false;
snprintf(msg, sizeof(msg), "%s %s #%u.", snprintf(msg, sizeof(msg), "%s %s #%u.",
(string_is_empty(display_name) && (string_is_empty(display_name) &&
!string_is_empty(params->name)) !string_is_empty(params->name))
? params->name : (!string_is_empty(display_name) ? display_name : "N/A"), ? params->name : (!string_is_empty(display_name) ? display_name : "N/A"),
msg_hash_to_str(MSG_DEVICE_CONFIGURED_IN_PORT), msg_hash_to_str(MSG_DEVICE_CONFIGURED_IN_PORT),
params->idx); params->idx);