The-Homebrew-Cloud/uae-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/uae-wii.git synced 2024-11-15 07:15:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Made menu screen higher, menu is cleared at exit

Browse Source
This commit is contained in:
fabio.olimpieri 2014-01-27 12:41:46 +00:00
parent ca4787e8b8
commit 5f1a96e343
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui-sdl/gui-sdl.c
View File

@ -1384,7 +1384,7 @@ void gui_display(int shortcut)
memset(submenus, 0, sizeof(submenus)); memset(submenus, 0, sizeof(submenus));
if (shortcut==-1) do //Enter Menu if (shortcut==-1) {do //Enter Menu
{ {
opt = menu_select_title("Main menu", main_menu_messages, submenus); opt = menu_select_title("Main menu", main_menu_messages, submenus);
notice_screen_contents_lost (); notice_screen_contents_lost ();
@ -1432,7 +1432,7 @@ void gui_display(int shortcut)
default: default:
break; break;
} }
} while (opt == 0 || opt == 5 || opt == 8 || opt == 9 || opt == 10); } while (opt == 0 || opt == 5 || opt == 8 || opt == 9 || opt == 10);flip_screen();}
if (shortcut==6) {virtual_keyboard(); notice_screen_contents_lost ();}//Enter Virtual Keyboard if (shortcut==6) {virtual_keyboard(); notice_screen_contents_lost ();}//Enter Virtual Keyboard

13
src/gui-sdl/menu.c
View File

@ -74,6 +74,11 @@ static TTF_Font *menu_font_alt16;
int fh, fw; int fh, fw;
void flip_screen (void)
{
SDL_Flip(real_screen);
}
int msgInfo(char *text, int duration, SDL_Rect *irc) int msgInfo(char *text, int duration, SDL_Rect *irc)
{ {
int len = strlen(text); int len = strlen(text);
@ -835,9 +840,9 @@ static int menu_select_internal(SDL_Surface *screen,
else if (keys & KEY_DOWN) else if (keys & KEY_DOWN)
select_next(p_menu, 0, 1, 1); select_next(p_menu, 0, 1, 1);
else if (keys & KEY_PAGEUP) else if (keys & KEY_PAGEUP)
select_next(p_menu, 0, -18, 0); select_next(p_menu, 0, -19, 0);
else if (keys & KEY_PAGEDOWN) else if (keys & KEY_PAGEDOWN)
select_next(p_menu, 0, 18, 0); select_next(p_menu, 0, 19, 0);
else if (keys & KEY_LEFT) else if (keys & KEY_LEFT)
select_next(p_menu, -1, 0 ,1); select_next(p_menu, -1, 0 ,1);
else if (keys & KEY_RIGHT) else if (keys & KEY_RIGHT)
@ -897,7 +902,7 @@ int menu_select_title(const char *title, const char **msgs, int *submenus)
{ {
SDL_FillRect(real_screen, 0, SDL_MapRGB(real_screen->format, 0, 0, 0)); SDL_FillRect(real_screen, 0, SDL_MapRGB(real_screen->format, 0, 0, 0));
return menu_select_sized(title, msgs, submenus, 0, return menu_select_sized(title, msgs, submenus, 0,
32, 32, FULL_DISPLAY_X-32, FULL_DISPLAY_Y-32, 32, 20, FULL_DISPLAY_X-32, FULL_DISPLAY_Y-20,
NULL, NULL, 20); NULL, NULL, 20);
} }
@ -1001,7 +1006,7 @@ const char *menu_select_file(const char *dir_path,const char *selected_file, int
if (dir_path == NULL) if (dir_path == NULL)
dir_path = ""; dir_path = "";
return menu_select_file_internal(dir_path, return menu_select_file_internal(dir_path,
0, 32, FULL_DISPLAY_X, FULL_DISPLAY_Y - 32, selected_file, which); 0, 20, FULL_DISPLAY_X, FULL_DISPLAY_Y - 20, selected_file, which);
} }
static TTF_Font *read_font(const char *path, int font_size) static TTF_Font *read_font(const char *path, int font_size)

2
src/gui-sdl/menu.h
View File

@ -55,6 +55,8 @@ int menu_is_inited(void);
int ext_matches(const char *name, const char *ext); int ext_matches(const char *name, const char *ext);
void flip_screen (void);
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif