eaw/Main
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve info handling.

Browse Source
This commit is contained in:
sorgelig
2018-02-28 03:24:47 +08:00
parent d235e806b2
commit 752c1add31
6 changed files with 51 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
menu.cpp
View File

@@ -782,6 +782,10 @@ void HandleUI(void)
OsdSetSize(8);
break;
case MENU_INFO:
if (CheckTimer(menu_timer)) menustate = MENU_NONE1;
// fall through
case MENU_ERROR:
case MENU_NONE2:
if (menu)
{
@@ -3278,26 +3282,6 @@ void HandleUI(void)
menustate = MENU_NONE1;
break;
/******************************************************************/
/* error message menu */
/******************************************************************/
case MENU_ERROR:
if (menu)
menustate = MENU_NONE1;
break;
/******************************************************************/
/* popup info menu */
/******************************************************************/
case MENU_INFO:
if (menu)
menustate = MENU_NONE1;
else if (CheckTimer(menu_timer))
menustate = MENU_NONE1;
break;
/******************************************************************/
/* we should never come here */
/******************************************************************/
@@ -3547,7 +3531,7 @@ void ErrorMessage(const char *message, unsigned char code)
OsdEnable(0); // do not disable KEYBOARD
}
void InfoMessage(const char *message)
void InfoMessage(const char *message, int timeout)
{
if (menustate != MENU_INFO)
{
@@ -3557,29 +3541,18 @@ void InfoMessage(const char *message)
set_text(message, 0);
menu_timer = GetTimer(2000);
menu_timer = GetTimer(timeout);
menustate = MENU_INFO;
}
void InfoMessageEx(const char *message, int timeout)
{
InfoMessage(message);
menu_timer = GetTimer(timeout);
}
void InfoEx(const char *message, int width, int height, int timeout)
void Info(const char *message, int timeout, int width, int height, int frame)
{
if (!user_io_osd_is_visible())
{
OSD_PrintInfo(message, width, height, 0);
OSD_PrintInfo(message, &width, &height, frame);
InfoEnable(20, 10, width, height);
menu_timer = GetTimer(timeout);
menustate = MENU_INFO;
}
}
void Info(const char *message, int width, int height)
{
InfoEx(message, width, height, 2000);
}