-fixed configured overlay setting not being applied on first start

-added left/right as page up/down keys in ROM browsers
This commit is contained in:
ekeeke31 2012-05-02 18:40:38 +00:00
parent 6743bac508
commit 3f0547776b
2 changed files with 39 additions and 33 deletions

View File

@ -494,28 +494,30 @@ int FileSelector(int type)
} }
/* go back one page */ /* go back one page */
else if (p & PAD_TRIGGER_L) else if (p & (PAD_TRIGGER_L | PAD_BUTTON_LEFT))
{ {
selection -= 10; selection -= 10;
if (selection < 0) if (selection < 0)
{ selection = offset = 0;
selection = maxfiles - 1;
offset = selection - 10 + 1;
}
if (selection < offset) if (selection < offset)
offset -= 10; offset -= 10;
if (offset < 0) if (offset < 0)
offset = 0; offset = 0;
} }
/* go forward one page */ /* go forward one page */
else if (p & PAD_TRIGGER_R) else if (p & (PAD_TRIGGER_R | PAD_BUTTON_RIGHT))
{ {
selection += 10; selection += 10;
if (selection > maxfiles - 1) if (selection > maxfiles - 1)
selection = offset = 0; {
selection = maxfiles - 1;
offset = selection - 10 + 1;
}
if ((selection - offset) >= 10) if ((selection - offset) >= 10)
offset += 10; offset += 10;
if (offset > maxfiles - 10)
offset = maxfiles - 10;
} }
/* quit */ /* quit */

View File

@ -3419,7 +3419,7 @@ void mainmenu(void)
gui_menu *m = &menu_main; gui_menu *m = &menu_main;
/* Update main menu */ /* Update main menu */
if (!m->screenshot && cart.romsize) if (!m->screenshot)
{ {
if (config.bg_overlay) if (config.bg_overlay)
{ {
@ -3437,31 +3437,35 @@ void mainmenu(void)
bg_list[1].state &= ~IMAGE_VISIBLE; bg_list[1].state &= ~IMAGE_VISIBLE;
bg_saves[2].state &= ~IMAGE_VISIBLE; bg_saves[2].state &= ~IMAGE_VISIBLE;
} }
m->screenshot = 128;
m->bg_images[0].state &= ~IMAGE_VISIBLE; if (cart.romsize)
m->items[0].y -= 90;
m->items[1].y -= 90;
m->items[2].y -= 90;
m->buttons[0].y -= 90;
m->buttons[1].y -= 90;
m->buttons[2].y -= 90;
m->buttons[0].shift[1] = 3;
m->buttons[1].shift[1] = 3;
m->buttons[2].shift[1] = 3;
m->buttons[3].state |= (BUTTON_VISIBLE | BUTTON_ACTIVE);
m->buttons[4].state |= (BUTTON_VISIBLE | BUTTON_ACTIVE);
m->buttons[5].state |= (BUTTON_VISIBLE | BUTTON_ACTIVE);
m->buttons[7].state |= (BUTTON_VISIBLE | BUTTON_ACTIVE);
m->buttons[8].state |= (BUTTON_VISIBLE | BUTTON_ACTIVE);
m->buttons[9].state |= (BUTTON_VISIBLE | BUTTON_ACTIVE);
if (areplay_get_status() >= 0)
{ {
menu_main.buttons[6].state |= (BUTTON_VISIBLE | BUTTON_ACTIVE); m->screenshot = 128;
menu_main.items[6].data = Button_sm_grey_png; m->bg_images[0].state &= ~IMAGE_VISIBLE;
menu_main.cb = mainmenu_cb; m->items[0].y -= 90;
menu_main.buttons[3].shift[1] = 3; m->items[1].y -= 90;
menu_main.buttons[7].shift[0] = 1; m->items[2].y -= 90;
menu_main.buttons[8].shift[2] = 2; m->buttons[0].y -= 90;
m->buttons[1].y -= 90;
m->buttons[2].y -= 90;
m->buttons[0].shift[1] = 3;
m->buttons[1].shift[1] = 3;
m->buttons[2].shift[1] = 3;
m->buttons[3].state |= (BUTTON_VISIBLE | BUTTON_ACTIVE);
m->buttons[4].state |= (BUTTON_VISIBLE | BUTTON_ACTIVE);
m->buttons[5].state |= (BUTTON_VISIBLE | BUTTON_ACTIVE);
m->buttons[7].state |= (BUTTON_VISIBLE | BUTTON_ACTIVE);
m->buttons[8].state |= (BUTTON_VISIBLE | BUTTON_ACTIVE);
m->buttons[9].state |= (BUTTON_VISIBLE | BUTTON_ACTIVE);
if (areplay_get_status() >= 0)
{
menu_main.buttons[6].state |= (BUTTON_VISIBLE | BUTTON_ACTIVE);
menu_main.items[6].data = Button_sm_grey_png;
menu_main.cb = mainmenu_cb;
menu_main.buttons[3].shift[1] = 3;
menu_main.buttons[7].shift[0] = 1;
menu_main.buttons[8].shift[2] = 2;
}
} }
} }