CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-07 10:50:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[zr] add image loading code (stb)

Browse Source
This commit is contained in:
radius 2016-03-05 23:02:29 -05:00
parent 992c66ffc8
commit f73d086abd
3 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/drivers/zr.c
View File

@ -622,6 +622,8 @@ static void zrmenu_init_device(zrmenu_handle_t *zr)
fill_pathname_join(buf, zr->assets_directory, "folder.png", sizeof(buf)); fill_pathname_join(buf, zr->assets_directory, "folder.png", sizeof(buf));
zr->icons.folder = zr_icon_load(buf); zr->icons.folder = zr_icon_load(buf);
fill_pathname_join(buf, zr->assets_directory, "speaker.png", sizeof(buf));
zr->icons.folder = zr_icon_load(buf);
zrmenu_set_style(&zr->ctx, THEME_DARK); zrmenu_set_style(&zr->ctx, THEME_DARK);
} }

22
menu/drivers/zr_common.c
View File

@ -1,3 +1,20 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2016 - Daniel De Matteis
* Copyright (C) 2014-2015 - Jean-André Santoni
* Copyright (C) 2016 - Andrés Suárez
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "zr_common.h" #include "zr_common.h"
#include <stdint.h> #include <stdint.h>
@ -427,7 +444,10 @@ void zrmenu_wnd_wizard(struct zr_context *ctx, zrmenu_handle_t *zr)
{ {
zr_layout_row_dynamic(ctx, 50, 2); zr_layout_row_dynamic(ctx, 50, 2);
zr_button_text_image(ctx, zr->icons.folder, zr_button_text_image(ctx, zr->icons.folder,
"Images", ZR_TEXT_CENTERED, ZR_BUTTON_DEFAULT); "Test", ZR_TEXT_CENTERED, ZR_BUTTON_DEFAULT);
zr_button_text_image(ctx, zr->icons.display,
"Test", ZR_TEXT_CENTERED, ZR_BUTTON_DEFAULT);
} }

21
menu/drivers/zr_common.h
View File

@ -1,3 +1,20 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2016 - Daniel De Matteis
* Copyright (C) 2014-2015 - Jean-André Santoni
* Copyright (C) 2016 - Andrés Suárez
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "../../deps/zahnrad/zahnrad.h" #include "../../deps/zahnrad/zahnrad.h"
#include "../menu_display.h" #include "../menu_display.h"
@ -24,6 +41,10 @@ enum zrmenu_theme
struct icons { struct icons {
struct zr_image folder; struct zr_image folder;
struct zr_image monitor;
struct zr_image gamepad;
struct zr_image settings;
struct zr_image speaker;
}; };
typedef struct zrmenu_handle typedef struct zrmenu_handle