tweaking pandora frontend

[libpicofe.git] / common / menu.c

diff --git a/common/menu.c b/common/menu.c
index 9402796..fdc8e89 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -187,11 +187,11 @@ static void menu_draw_selection(int x, int y, int w)
        if (menu_sel_color < 0) return; // no selection hilight\r
 \r
        if (y > 0) y--;\r
-       dest = (unsigned short *)g_screen_ptr + x + y * g_screen_width + 14;\r
+       dest = (unsigned short *)g_screen_ptr + x + y * g_screen_width + me_mfont_w * 2 - 2;\r
        for (h = me_mfont_h + 1; h > 0; h--)\r
        {\r
                dst = dest;\r
-               for (i = w - 14; i > 0; i--)\r
+               for (i = w - (me_mfont_w * 2 - 2); i > 0; i--)\r
                        *dst++ = menu_sel_color;\r
                dest += g_screen_width;\r
        }\r
@@ -268,12 +268,13 @@ void menu_init(void)
 \r
        // load custom font and selector (stored as 1st symbol in font table)\r
        emu_make_path(buff, "skin/font.png", sizeof(buff));\r
-       readpng(menu_font_data, buff, READPNG_FONT);\r
+       readpng(menu_font_data, buff, READPNG_FONT,\r
+               MENU_X2 ? 256 : 128, MENU_X2 ? 320 : 160);\r
        // default selector symbol is '>'\r
        memcpy(menu_font_data, menu_font_data + ((int)'>') * me_mfont_w * me_mfont_h / 2,\r
                me_mfont_w * me_mfont_h / 2);\r
        emu_make_path(buff, "skin/selector.png", sizeof(buff));\r
-       readpng(menu_font_data, buff, READPNG_SELECTOR);\r
+       readpng(menu_font_data, buff, READPNG_SELECTOR, MENU_X2 ? 16 : 8, MENU_X2 ? 20 : 10);\r
 \r
        // load custom colors\r
        emu_make_path(buff, "skin/skin.txt", sizeof(buff));\r
@@ -343,7 +344,7 @@ static void menu_enter(int is_rom_loaded)
 \r
                // should really only happen once, on startup..\r
                emu_make_path(buff, "skin/background.png", sizeof(buff));\r
-               if (readpng(g_menubg_ptr, buff, READPNG_BG) < 0)\r
+               if (readpng(g_menubg_ptr, buff, READPNG_BG, g_screen_width, g_screen_height) < 0)\r
                        memset(g_menubg_ptr, 0, g_screen_width * g_screen_height * 2);\r
        }\r
 \r
@@ -378,11 +379,11 @@ static int me_count(const menu_entry *ent)
 \r
 static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))\r
 {\r
-       const menu_entry *ent;\r
+       const menu_entry *ent, *ent_sel = entries;\r
        int x, y, w = 0, h = 0;\r
        int offs, col2_offs = 27 * me_mfont_w;\r
+       int vi_sel_ln = 0;\r
        const char *name;\r
-       int asel = 0;\r
        int i, n;\r
 \r
        /* calculate size of menu rect */\r
@@ -393,8 +394,10 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
                if (!ent->enabled)\r
                        continue;\r
 \r
-               if (i == sel)\r
-                       asel = n;\r
+               if (i == sel) {\r
+                       ent_sel = ent;\r
+                       vi_sel_ln = n;\r
+               }\r
 \r
                name = NULL;\r
                wt = strlen(ent->name) * me_mfont_w;\r
@@ -450,7 +453,7 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
 \r
        /* draw */\r
        plat_video_menu_begin();\r
-       menu_draw_selection(x, y + asel * me_mfont_h, w);\r
+       menu_draw_selection(x, y + vi_sel_ln * me_mfont_h, w);\r
        x += me_mfont_w * 2;\r
 \r
        for (ent = entries; ent->name; ent++)\r
@@ -517,13 +520,13 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
                if (plat_get_ticks_ms() - menu_error_time > 2048)\r
                        menu_error_msg[0] = 0;\r
        }\r
-       else if (entries[asel].help != NULL) {\r
-               const char *tmp = entries[asel].help;\r
+       else if (ent_sel->help != NULL) {\r
+               const char *tmp = ent_sel->help;\r
                int l;\r
                for (l = 0; tmp != NULL && *tmp != 0; l++)\r
                        tmp = strchr(tmp + 1, '\n');\r
                if (h >= l * me_sfont_h + 4)\r
-                       for (tmp = entries[asel].help; l > 0; l--, tmp = strchr(tmp, '\n') + 1)\r
+                       for (tmp = ent_sel->help; l > 0; l--, tmp = strchr(tmp, '\n') + 1)\r
                                smalltext_out16(5, g_screen_height - (l * me_sfont_h + 4), tmp, 0xffff);\r
        }\r
 \r