X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fcommon%2Fmenu.c;h=ae1ff57d0da05dd06bc821957a5a2b9b66bcf9ee;hb=297b3d633ad25797a4f355c57964b7ce3aee6936;hp=d9717d46fdbb306b31bfcdd80c45993a5597aacb;hpb=bd6267e616cc4966fadf971019fe15db2469e97d;p=pcsx_rearmed.git diff --git a/frontend/common/menu.c b/frontend/common/menu.c index d9717d46..ae1ff57d 100644 --- a/frontend/common/menu.c +++ b/frontend/common/menu.c @@ -341,26 +341,6 @@ static void menu_darken_bg(void *dst, void *src, int pixels, int darker) } } -static void menu_enter(int is_rom_loaded) -{ - if (is_rom_loaded) - { - // darken the active framebuffer - menu_darken_bg(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h, 1); - } - else - { - char buff[256]; - - // should really only happen once, on startup.. - emu_make_path(buff, "skin/background.png", sizeof(buff)); - if (readpng(g_menubg_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h) < 0) - memset(g_menubg_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2); - } - - plat_video_menu_enter(is_rom_loaded); -} - static int me_id2offset(const menu_entry *ent, menu_id id) { int i; @@ -673,7 +653,7 @@ static void draw_menu_credits(void (*draw_more)(void)) p++; } - x = g_menuscreen_w / 2 - w * me_mfont_w / 2; + x = g_menuscreen_w / 2 - w * me_mfont_w / 2; y = g_menuscreen_h / 2 - h * me_mfont_h / 2; if (x < 0) x = 0; if (y < 0) y = 0; @@ -969,6 +949,10 @@ static void draw_savestate_menu(int menu_sel, int is_loading) if (x < 0) x = 0; y = g_menuscreen_h / 2 - h / 2; if (y < 0) y = 0; +#ifdef MENU_ALIGN_LEFT + if (x > 12 + me_mfont_w * 2) + x = 12 + me_mfont_w * 2; +#endif menu_draw_begin(1);