From f698a0923b785165eb6b0f10c97a0222eb51ee26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Thu, 25 Jun 2015 11:14:22 +0700 Subject: [PATCH] (XMB) Dislay a close icon for the close entry of the quick menu --- menu/drivers/xmb.c | 6 ++++++ menu/menu.h | 1 + menu/menu_displaylist.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 1c26a40d8a..4cb31fd52f 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -67,6 +67,7 @@ enum XMB_TEXTURE_SUBSETTING, XMB_TEXTURE_ARROW, XMB_TEXTURE_RUN, + XMB_TEXTURE_CLOSE, XMB_TEXTURE_RESUME, XMB_TEXTURE_SAVESTATE, XMB_TEXTURE_LOADSTATE, @@ -1091,6 +1092,8 @@ static GLuint xmb_icon_get_id(xmb_handle_t *xmb, return xmb->textures.list[XMB_TEXTURE_CURSOR].id; case MENU_SETTING_ACTION_RUN: return xmb->textures.list[XMB_TEXTURE_RUN].id; + case MENU_SETTING_ACTION_CLOSE: + return xmb->textures.list[XMB_TEXTURE_CLOSE].id; case MENU_SETTING_ACTION_SAVESTATE: return xmb->textures.list[XMB_TEXTURE_SAVESTATE].id; case MENU_SETTING_ACTION_LOADSTATE: @@ -1971,6 +1974,9 @@ static void xmb_context_reset_textures(xmb_handle_t *xmb, const char *iconpath) case XMB_TEXTURE_RUN: fill_pathname_join(path, iconpath, "run.png", sizeof(path)); break; + case XMB_TEXTURE_CLOSE: + fill_pathname_join(path, iconpath, "close.png", sizeof(path)); + break; case XMB_TEXTURE_RESUME: fill_pathname_join(path, iconpath, "resume.png", sizeof(path)); break; diff --git a/menu/menu.h b/menu/menu.h index 4a5c08868b..7ba563b470 100644 --- a/menu/menu.h +++ b/menu/menu.h @@ -95,6 +95,7 @@ typedef enum MENU_SETTING_DRIVER, MENU_SETTING_ACTION, MENU_SETTING_ACTION_RUN, + MENU_SETTING_ACTION_CLOSE, MENU_SETTING_ACTION_CORE_OPTIONS, MENU_SETTING_ACTION_CORE_INPUT_REMAPPING_OPTIONS, MENU_SETTING_ACTION_CORE_CHEAT_OPTIONS, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 339a14a250..1b1276b2a6 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -1540,7 +1540,7 @@ static int menu_displaylist_parse_load_content_settings(menu_displaylist_info_t menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_CLOSE_CONTENT), menu_hash_to_str(MENU_LABEL_CLOSE_CONTENT), - MENU_SETTING_ACTION_RUN, 0, 0); + MENU_SETTING_ACTION_CLOSE, 0, 0); menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_TAKE_SCREENSHOT),