From 2a329950f66ce13145a4d24689c38b1e69d5a71f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 17 Apr 2019 23:40:05 +0200 Subject: [PATCH] - fixed menu caption for languages which use the VGA font. --- wadsrc/static/zscript/ui/menu/optionmenu.zs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/wadsrc/static/zscript/ui/menu/optionmenu.zs b/wadsrc/static/zscript/ui/menu/optionmenu.zs index a6d8216c2..2dff1a873 100644 --- a/wadsrc/static/zscript/ui/menu/optionmenu.zs +++ b/wadsrc/static/zscript/ui/menu/optionmenu.zs @@ -225,9 +225,10 @@ class OptionMenu : Menu if (y <= 0) { - if (mDesc.mFont && mDesc.mTitle.Length() > 0) + let font = generic_ui || !mDesc.mFont? NewSmallFont : mDesc.mFont; + if (font && mDesc.mTitle.Length() > 0) { - y = -y + mDesc.mFont.GetHeight(); + y = -y + font.GetHeight(); } else { @@ -422,13 +423,14 @@ class OptionMenu : Menu if (y <= 0) { - if (mDesc.mFont && mDesc.mTitle.Length() > 0) + let font = generic_ui || !mDesc.mFont? NewSmallFont : mDesc.mFont; + if (font && mDesc.mTitle.Length() > 0) { let tt = Stringtable.Localize(mDesc.mTitle); - screen.DrawText (mDesc.mFont, OptionMenuSettings.mTitleColor, - (screen.GetWidth() - mDesc.mFont.StringWidth(tt) * CleanXfac_1) / 2, 10*CleanYfac_1, + screen.DrawText (font, OptionMenuSettings.mTitleColor, + (screen.GetWidth() - font.StringWidth(tt) * CleanXfac_1) / 2, 10*CleanYfac_1, tt, DTA_CleanNoMove_1, true); - y = -y + mDesc.mFont.GetHeight(); + y = -y + font.GetHeight(); } else {