zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added per-item colors for static text items in the menu.

Browse source 
For option menus this replaces the 'highlighted' parameter with an actual color, for list menus it adds a new parameter.
This commit is contained in:
Christoph Oelckers 2016-06-30 10:27:14 +02:00
parent 4defb6e967
commit c6fb35ed52
2 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/menu/menudef.cpp
View file

@ -306,7 +306,15 @@ static void ParseListMenuBody(FScanner &sc, FListMenuDescriptor *desc)
int y = sc.Number; int y = sc.Number;
sc.MustGetStringName(","); sc.MustGetStringName(",");
sc.MustGetString(); sc.MustGetString();
FListMenuItem *it = new FListMenuItemStaticText(x, y, sc.String, desc->mFont, desc->mFontColor, centered); FString label = sc.String;
EColorRange cr = desc->mFontColor;
if (sc.CheckString(","))
{
sc.MustGetString();
cr = V_FindFontColor(sc.String);
if (cr == CR_UNTRANSLATED && !sc.Compare("untranslated")) cr = desc->mFontColor;
}
FListMenuItem *it = new FListMenuItemStaticText(x, y, label, desc->mFont, cr, centered);
desc->mItems.Push(it); desc->mItems.Push(it);
} }
else if (sc.Compare("PatchItem")) else if (sc.Compare("PatchItem"))
@ -648,6 +656,21 @@ static void ParseOptionSettings(FScanner &sc)
// //
//============================================================================= //=============================================================================
static EColorRange ParseOptionColor(FScanner &sc, FOptionMenuDescriptor *desc)
{
EColorRange cr = OptionSettings.mFontColor;
if (sc.CheckString(","))
{
sc.MustGetString();
EColorRange cr = V_FindFontColor(sc.String);
if (cr == CR_UNTRANSLATED && !sc.Compare("untranslated") && isdigit(sc.String[0]))
{
if (strtol(sc.String, NULL, 0)) cr = OptionSettings.mFontColorHeader;
}
}
return cr;
}
static void ParseOptionMenuBody(FScanner &sc, FOptionMenuDescriptor *desc) static void ParseOptionMenuBody(FScanner &sc, FOptionMenuDescriptor *desc)
{ {
sc.MustGetStringName("{"); sc.MustGetStringName("{");
@ -784,12 +807,7 @@ static void ParseOptionMenuBody(FScanner &sc, FOptionMenuDescriptor *desc)
{ {
sc.MustGetString(); sc.MustGetString();
FString label = sc.String; FString label = sc.String;
bool cr = false; EColorRange cr = ParseOptionColor(sc, desc);
if (sc.CheckString(","))
{
sc.MustGetNumber();
cr = !!sc.Number;
}
FOptionMenuItem *it = new FOptionMenuItemStaticText(label, cr); FOptionMenuItem *it = new FOptionMenuItemStaticText(label, cr);
desc->mItems.Push(it); desc->mItems.Push(it);
} }
@ -803,12 +821,7 @@ static void ParseOptionMenuBody(FScanner &sc, FOptionMenuDescriptor *desc)
sc.MustGetStringName(","); sc.MustGetStringName(",");
sc.MustGetString(); sc.MustGetString();
FName action = sc.String; FName action = sc.String;
bool cr = false; EColorRange cr = ParseOptionColor(sc, desc);
if (sc.CheckString(","))
{
sc.MustGetNumber();
cr = !!sc.Number;
}
FOptionMenuItem *it = new FOptionMenuItemStaticTextSwitchable(label, label2, action, cr); FOptionMenuItem *it = new FOptionMenuItemStaticTextSwitchable(label, label2, action, cr);
desc->mItems.Push(it); desc->mItems.Push(it);
} }

12
src/menu/optionmenuitems.h
View file

@ -483,7 +483,13 @@ public:
FOptionMenuItemStaticText(const char *label, bool header) FOptionMenuItemStaticText(const char *label, bool header)
: FOptionMenuItem(label, NAME_None, true) : FOptionMenuItem(label, NAME_None, true)
{ {
mColor = header? OptionSettings.mFontColorHeader : OptionSettings.mFontColor; mColor = header ? OptionSettings.mFontColorHeader : OptionSettings.mFontColor;
}
FOptionMenuItemStaticText(const char *label, EColorRange cr)
: FOptionMenuItem(label, NAME_None, true)
{
mColor = cr;
} }
int Draw(FOptionMenuDescriptor *desc, int y, int indent, bool selected) int Draw(FOptionMenuDescriptor *desc, int y, int indent, bool selected)
@ -512,10 +518,10 @@ class FOptionMenuItemStaticTextSwitchable : public FOptionMenuItem
int mCurrent; int mCurrent;
public: public:
FOptionMenuItemStaticTextSwitchable(const char *label, const char *label2, FName action, bool header) FOptionMenuItemStaticTextSwitchable(const char *label, const char *label2, FName action, EColorRange cr)
: FOptionMenuItem(label, action, true) : FOptionMenuItem(label, action, true)
{ {
mColor = header? OptionSettings.mFontColorHeader : OptionSettings.mFontColor; mColor = cr;
mAltText = label2; mAltText = label2;
mCurrent = 0; mCurrent = 0;
} }