Menu|Definitions: Use Values to replace menu text labels

Improved implementation that works with titles as well.
skyjake · Mar 10, 2019 · 3e7406f · 3e7406f
1 parent 573c6a9
commit 3e7406f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 15 deletions.
diff --git a/doomsday/apps/plugins/common/include/menu/widgets/widget.h b/doomsday/apps/plugins/common/include/menu/widgets/widget.h
@@ -237,6 +237,8 @@ class Widget
 
     virtual void pageActivated();
 
+    static de::String labelText(const de::String &text);
+
 private:
     DENG2_PRIVATE(d)
 };

diff --git a/doomsday/apps/plugins/common/src/hu_menu.cpp b/doomsday/apps/plugins/common/src/hu_menu.cpp
@@ -2471,14 +2471,16 @@ void Hu_MenuDrawFocusCursor(Vector2i const &origin, float scale, float alpha)
 
 void Hu_MenuDrawPageTitle(String title, Vector2i const &origin)
 {
-    if(title.isEmpty()) return;
+    title = Widget::labelText(title);
+
+    if(title.isEmpty()) return;    
 
     DGL_Enable(DGL_TEXTURE_2D);
     FR_SetFont(FID(GF_FONTB));
     FR_SetColorv(cfg.common.menuTextColors[0]);
     FR_SetAlpha(mnRendState->pageAlpha);
 
-    FR_DrawTextXY3(title.toUtf8().constData(), origin.x, origin.y, ALIGN_TOP, Hu_MenuMergeEffectWithDrawTextFlags(0));
+    FR_DrawTextXY3(title.toLatin1(), origin.x, origin.y, ALIGN_TOP, Hu_MenuMergeEffectWithDrawTextFlags(0));
 
     DGL_Disable(DGL_TEXTURE_2D);
 }
@@ -2499,7 +2501,7 @@ void Hu_MenuDrawPageHelp(String helpText, Vector2i const &origin)
     FR_SetColorv(cfg.common.menuTextColors[1]);
     FR_SetAlpha(mnRendState->pageAlpha);
 
-    FR_DrawTextXY3(helpText.toUtf8().constData(), origin.x, origin.y, ALIGN_BOTTOM, Hu_MenuMergeEffectWithDrawTextFlags(0));
+    FR_DrawTextXY3(helpText.toLatin1(), origin.x, origin.y, ALIGN_BOTTOM, Hu_MenuMergeEffectWithDrawTextFlags(0));
 
     DGL_Disable(DGL_TEXTURE_2D);
 
@@ -3145,7 +3147,7 @@ void Hu_MenuDrawLoadGamePage(Page const & /*page*/, Vector2i const &origin)
     FR_SetColorAndAlpha(cfg.common.menuTextColors[0][CR], cfg.common.menuTextColors[0][CG], cfg.common.menuTextColors[0][CB], mnRendState->pageAlpha);
 
 #if __JHERETIC__ || __JHEXEN__
-    FR_DrawTextXY3("Load Game", SCREENWIDTH / 2, origin.y - 20, ALIGN_TOP, Hu_MenuMergeEffectWithDrawTextFlags(0));
+    FR_DrawTextXY3(Widget::labelText("Load Game").toLatin1(), SCREENWIDTH / 2, origin.y - 20, ALIGN_TOP, Hu_MenuMergeEffectWithDrawTextFlags(0));
 #else
     WI_DrawPatch(pLoadGame, Hu_ChoosePatchReplacement(patchreplacemode_t(cfg.common.menuPatchReplaceMode), pLoadGame),
                  Vector2i(origin.x - 8, origin.y - 26), ALIGN_TOPLEFT, 0, Hu_MenuMergeEffectWithDrawTextFlags(0));

diff --git a/doomsday/apps/plugins/common/src/menu/widgets/buttonwidget.cpp b/doomsday/apps/plugins/common/src/menu/widgets/buttonwidget.cpp
@@ -166,15 +166,7 @@ String ButtonWidget::text() const
 
 ButtonWidget &ButtonWidget::setText(String const &newText)
 {
-    // Widget text may be replaced with Values.
-    if (const auto *repl = Defs().getValueById("Menu Label|" + newText))
-    {
-        d->text = repl->text;
-    }
-    else
-    {
-        d->text = newText;
-    }
+    d->text = labelText(newText);
     return *this;
 }
 

diff --git a/doomsday/apps/plugins/common/src/menu/widgets/labelwidget.cpp b/doomsday/apps/plugins/common/src/menu/widgets/labelwidget.cpp
@@ -120,9 +120,9 @@ LabelWidget &LabelWidget::setPatch(patchid_t *newPatch)
     return *this;
 }
 
-LabelWidget &LabelWidget::setText(String const &newText)
+LabelWidget &LabelWidget::setText(const String &text)
 {
-    d->text = newText;
+    d->text = labelText(text);
     return *this;
 }
 

diff --git a/doomsday/apps/plugins/common/src/menu/widgets/widget.cpp b/doomsday/apps/plugins/common/src/menu/widgets/widget.cpp
@@ -23,6 +23,7 @@
 #include "menu/widgets/widget.h"
 #include "menu/page.h"
 
+#include "g_defs.h"
 #include "hu_menu.h" // menu sounds
 
 using namespace de;
@@ -343,5 +344,15 @@ Vector4f Widget::selectionFlashColor(const Vector4f &noFlashColor) const
 void Widget::pageActivated()
 {}
 
+String Widget::labelText(const String &text) // static
+{
+    // Widget text may be replaced with Values.
+    if (const auto *repl = Defs().getValueById("Menu Label|" + text))
+    {
+        return repl->text;
+    }
+    return text;
+}
+
 } // namespace menu
 } // namespace common