AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-25 13:55:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

add prev/next indicators for multiple-choice menu items (#843)

Browse Source 
* add prev/next indicators for multiple-choice menu items

* blinking prev/next indicators
This commit is contained in:
Fabian Greffrath 2022-12-12 11:01:21 +01:00 committed by GitHub
parent ae6a6845bd
commit 2e97d235f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/m_menu.c
View File

@ -2108,6 +2108,20 @@ char ResetButtonName[2][8] = {"M_BUTT1","M_BUTT2"};
void M_DrawStringDisable(int cx, int cy, const char *ch);
static boolean PrevItemAvailable (setup_menu_t *s)
{
const int value = s->var.def->location->i;
return ((s->var.def->limit.min == UL || value > s->var.def->limit.min) &&
(!s->selectstrings || value > 0));
}
static boolean NextItemAvailable (setup_menu_t *s)
{
const int value = s->var.def->location->i;
return ((s->var.def->limit.max == UL || value < s->var.def->limit.max) &&
(!s->selectstrings || s->selectstrings[value + 1]));
}
void M_DrawItem(setup_menu_t* s)
{
int x = s->m_x;
@ -2147,10 +2161,15 @@ void M_DrawItem(setup_menu_t* s)
// [FG] print a blinking "arrow" next to the currently highlighted menu item
if (s == current_setup_menu + set_menu_itemon && whichSkull)
{
if (flags & S_DISABLE)
if ((flags & (S_CHOICE|S_CRITEM|S_THERMO)) && setup_select)
{
if (PrevItemAvailable(s))
M_DrawString(x - w - 8, y, color, "<");
}
else if (flags & S_DISABLE)
M_DrawStringDisable(x - w - 8, y, ">");
else
M_DrawString(x - w - 8, y, color, ">");
M_DrawString(x - w - 8, y, color, ">");
}
}
free(t);
@ -2424,10 +2443,15 @@ void M_DrawSetting(setup_menu_t* s)
else
M_DrawMenuString(x, y, flags & S_CRITEM ? i : color);
// [FG] print a blinking "arrow" next to the currently highlighted menu item
if (s == current_setup_menu + set_menu_itemon && whichSkull && !setup_select)
if (s == current_setup_menu + set_menu_itemon && whichSkull)
{
int width = M_GetPixelWidth(menu_buffer);
if (flags & S_DISABLE)
if (setup_select)
{
if (NextItemAvailable(s))
M_DrawString(x + width, y, color, " >");
}
else if (flags & S_DISABLE)
M_DrawStringDisable(x + width, y, " <");
else
M_DrawString(x + width, y, color, " <");
@ -2451,8 +2475,16 @@ void M_DrawSetting(setup_menu_t* s)
M_snprintf(menu_buffer, 4, "%d", value);
// [FG] print a blinking "arrow" next to the currently highlighted menu item
if (s == current_setup_menu + set_menu_itemon && whichSkull && !setup_select)
strcat(menu_buffer, " <");
if (s == current_setup_menu + set_menu_itemon && whichSkull)
{
if (setup_select)
{
if (NextItemAvailable(s))
strcat(menu_buffer, " >");
}
else
strcat(menu_buffer, " <");
}
if (flags & S_DISABLE)
M_DrawStringDisable(x + M_THRM_WIDTH, y, menu_buffer);