zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-08 16:52:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged https://github.com/ZDoom/gzdoom/pull/1902 (Custom Message Box)

Browse source
This commit is contained in:
Major Cooke 2023-01-21 11:13:10 -06:00
parent b5a95b47c1
commit a87b3a0e55
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wadsrc/static/zscript/engine/ui/menu/custommessagebox.zs
View file

@ -78,7 +78,7 @@ class CustomMessageBoxMenuBase : Menu abstract
} }
else else
{ {
arrowFont = ConFont; arrowFont = ((textFont && textFont.GetGlyphHeight(0xd) > 0) ? textFont : ConFont);
destWidth = CleanWidth; destWidth = CleanWidth;
destHeight = CleanHeight; destHeight = CleanHeight;
selector = "\xd"; selector = "\xd";
@ -133,7 +133,7 @@ class CustomMessageBoxMenuBase : Menu abstract
if ((MenuTime() % 8) < 6) if ((MenuTime() % 8) < 6)
{ {
screen.DrawText(arrowFont, OptionMenuSettings.mFontColorSelection, screen.DrawText(arrowFont, OptionMenuSettings.mFontColorSelection,
(destWidth/2 - 11) + OptionXOffset(messageSelection), y + fontheight * messageSelection, selector, DTA_VirtualWidth, destWidth, DTA_VirtualHeight, destHeight, DTA_KeepRatio, true); (destWidth/2 - 3 - arrowFont.StringWidth(selector)) + OptionXOffset(messageSelection), y + fontheight * messageSelection, selector, DTA_VirtualWidth, destWidth, DTA_VirtualHeight, destHeight, DTA_KeepRatio, true);
} }
} }
} }

4
wadsrc/static/zscript/engine/ui/menu/messagebox.zs
View file

@ -79,7 +79,7 @@ class MessageBoxMenu : Menu
} }
else else
{ {
arrowFont = ConFont; arrowFont = ((textFont && textFont.GetGlyphHeight(0xd) > 0) ? textFont : ConFont);
destWidth = CleanWidth; destWidth = CleanWidth;
destHeight = CleanHeight; destHeight = CleanHeight;
selector = "\xd"; selector = "\xd";
@ -134,7 +134,7 @@ class MessageBoxMenu : Menu
if ((MenuTime() % 8) < 6) if ((MenuTime() % 8) < 6)
{ {
screen.DrawText(arrowFont, OptionMenuSettings.mFontColorSelection, screen.DrawText(arrowFont, OptionMenuSettings.mFontColorSelection,
destWidth/2 - 11, y + fontheight * messageSelection, selector, DTA_VirtualWidth, destWidth, DTA_VirtualHeight, destHeight, DTA_KeepRatio, true); destWidth/2 - 3 - arrowFont.StringWidth(selector), y + fontheight * messageSelection, selector, DTA_VirtualWidth, destWidth, DTA_VirtualHeight, destHeight, DTA_KeepRatio, true);
} }
} }
} }