mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Refactors

Browse Source
This commit is contained in:
twinaphex 2015-09-25 21:32:16 +02:00
parent 332312fab8
commit eae4d761ba
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
menu/drivers/rgui.c
View File

@ -637,6 +637,8 @@ static void rgui_render(void)
static void *rgui_init(void)
{
size_t fb_pitch;
unsigned fb_width, fb_height;
bool ret = false;
menu_framebuf_t *frame_buf = NULL;
menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu));
@ -658,10 +660,16 @@ static void *rgui_init(void)
if (!frame_buf->data)
goto error;
frame_buf->width = 320;
frame_buf->height = 240;
fb_width = 320;
fb_height = 240;
fb_pitch = fb_width * sizeof(uint16_t);
menu_display_ctl(MENU_DISPLAY_CTL_SET_WIDTH, &fb_width);
menu_display_ctl(MENU_DISPLAY_CTL_SET_HEIGHT, &fb_height);
menu->display.header_height = FONT_HEIGHT_STRIDE * 2;
frame_buf->pitch = frame_buf->width * sizeof(uint16_t);
menu_display_ctl(MENU_DISPLAY_CTL_SET_FB_PITCH, &fb_pitch);
menu_entries_set_start(0);
@ -670,11 +678,11 @@ static void *rgui_init(void)
if (!ret)
goto error;
fill_rect(frame_buf->data, frame_buf->pitch, 0, frame_buf->height,
frame_buf->width, 4, gray_filler);
fill_rect(frame_buf->data, fb_pitch, 0, fb_height,
fb_width, 4, gray_filler);
rgui->last_width = frame_buf->width;
rgui->last_height = frame_buf->height;
rgui->last_width = fb_width;
rgui->last_height = fb_height;
return menu;

7
menu/drivers/xmb.c
View File

@ -1803,7 +1803,6 @@ static void *xmb_init(void)
menu_handle_t *menu = NULL;
xmb_handle_t *xmb = NULL;
const video_driver_t *video_driver = NULL;
menu_framebuf_t *frame_buf = NULL;
float scale_factor = 1;
gl_t *gl = (gl_t*)
video_driver_get_ptr(&video_driver);
@ -1821,8 +1820,6 @@ static void *xmb_init(void)
if (!menu)
goto error;
frame_buf = menu_display_fb_get_ptr();
video_driver_get_size(&width, &height);
menu->userdata = (xmb_handle_t*)calloc(1, sizeof(xmb_handle_t));
@ -1871,8 +1868,8 @@ static void *xmb_init(void)
* for XMB, we should refactor this dependency
* away. */
frame_buf->width = width;
frame_buf->height = height;
menu_display_ctl(MENU_DISPLAY_CTL_SET_WIDTH, &width);
menu_display_ctl(MENU_DISPLAY_CTL_SET_HEIGHT, &height);
xmb_init_horizontal_list(menu, xmb);
xmb_font(menu);