ozone: add Y and X to hint bar

This commit is contained in:
natinusala 2019-03-11 13:31:27 +01:00
parent eb7797daa5
commit e3907f2380
5 changed files with 33 additions and 2 deletions

View File

@ -4806,6 +4806,10 @@ MSG_HASH(
MSG_SCREENSHOT_SAVED,
"Screenshot saved"
)
MSG_HASH(
MSG_CHANGE_THUMBNAIL_TYPE,
"Change thumbnail type"
)
MSG_HASH(
MSG_NO_THUMBNAIL_AVAILABLE,
"No thumbnail available"

View File

@ -1276,8 +1276,10 @@ static void ozone_draw_footer(ozone_handle_t *ozone, video_frame_info_t *video_i
/* Buttons */
{
unsigned back_width = 215;
unsigned ok_width = 96;
unsigned back_width = 215;
unsigned ok_width = 96;
unsigned search_width = 343;
unsigned thumb_width = 343 + 188 + 80;
bool do_swap = video_info->input_menu_swap_ok_cancel_buttons;
if (do_swap)
@ -1299,6 +1301,11 @@ static void ozone_draw_footer(ozone_handle_t *ozone, video_frame_info_t *video_i
ozone_draw_icon(video_info, 25, 25, ozone->theme->textures[OZONE_THEME_TEXTURE_BUTTON_A], video_info->width - 133, video_info->height - ozone->dimensions.footer_height / 2 - 12, video_info->width,video_info->height, 0, 1, NULL);
}
ozone_draw_icon(video_info, 26, 26, ozone->theme->textures[OZONE_THEME_TEXTURE_BUTTON_X], video_info->width - 379, video_info->height - ozone->dimensions.footer_height / 2 - 12, video_info->width,video_info->height, 0, 1, NULL);
if (ozone->is_playlist && !ozone->cursor_in_sidebar)
ozone_draw_icon(video_info, 26, 26, ozone->theme->textures[OZONE_THEME_TEXTURE_BUTTON_Y], video_info->width - 379 - 118 - 100 - 50, video_info->height - ozone->dimensions.footer_height / 2 - 12, video_info->width,video_info->height, 0, 1, NULL);
menu_display_blend_end(video_info);
ozone_draw_text(video_info, ozone,
@ -1311,6 +1318,16 @@ static void ozone_draw_footer(ozone_handle_t *ozone, video_frame_info_t *video_i
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK) :
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK),
video_info->width - ok_width, video_info->height - ozone->dimensions.footer_height / 2 + FONT_SIZE_FOOTER * 3/8, TEXT_ALIGN_LEFT, video_info->width, video_info->height, ozone->fonts.footer, ozone->theme->text_rgba, false);
ozone_draw_text(video_info, ozone,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SEARCH),
video_info->width - search_width, video_info->height - ozone->dimensions.footer_height / 2 + FONT_SIZE_FOOTER * 3/8, TEXT_ALIGN_LEFT, video_info->width, video_info->height, ozone->fonts.footer, ozone->theme->text_rgba, false);
if (ozone->is_playlist && !ozone->cursor_in_sidebar)
ozone_draw_text(video_info, ozone,
msg_hash_to_str(MSG_CHANGE_THUMBNAIL_TYPE),
video_info->width - thumb_width, video_info->height - ozone->dimensions.footer_height / 2 + FONT_SIZE_FOOTER * 3/8, TEXT_ALIGN_LEFT, video_info->width, video_info->height, ozone->fonts.footer, ozone->theme->text_rgba, false);
}
menu_display_blend_end(video_info);

View File

@ -26,6 +26,7 @@
#include "../../menu_driver.h"
#include "../../../cheevos/badges.h"
#include "../../../verbosity.h"
menu_texture_item ozone_entries_icon_get_texture(ozone_handle_t *ozone,
enum msg_hash_enums enum_idx, unsigned type, bool active)
@ -760,7 +761,10 @@ bool ozone_reset_theme_textures(ozone_handle_t *ozone)
strlcat(filename, ".png", sizeof(filename));
if (!menu_display_reset_textures_list(filename, theme_path, &theme->textures[i], TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL))
{
RARCH_WARN("[OZONE] Asset missing: %s%s%s\n", theme_path, path_default_slash(), filename);
result = false;
}
}
}

View File

@ -42,6 +42,8 @@ static const char *OZONE_TEXTURES_FILES[OZONE_TEXTURE_LAST] = {
enum OZONE_THEME_TEXTURES {
OZONE_THEME_TEXTURE_BUTTON_A = 0,
OZONE_THEME_TEXTURE_BUTTON_B,
OZONE_THEME_TEXTURE_BUTTON_X,
OZONE_THEME_TEXTURE_BUTTON_Y,
OZONE_THEME_TEXTURE_SWITCH,
OZONE_THEME_TEXTURE_CHECK,
@ -54,8 +56,11 @@ enum OZONE_THEME_TEXTURES {
static const char *OZONE_THEME_TEXTURES_FILES[OZONE_THEME_TEXTURE_LAST] = {
"button_a",
"button_b",
"button_x",
"button_y",
"switch",
"check",
"cursor_noborder",
"cursor_static"
};

View File

@ -347,6 +347,7 @@ enum msg_hash_enums
MSG_MOVIE_PLAYBACK_ENDED,
MSG_TAKING_SCREENSHOT,
MSG_SCREENSHOT_SAVED,
MSG_CHANGE_THUMBNAIL_TYPE,
MSG_NO_THUMBNAIL_AVAILABLE,
MSG_PRESS_AGAIN_TO_QUIT,
MSG_WIFI_SCAN_COMPLETE,