From be55e26689f0589d113ca2ce240c325d5f9d3179 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 5 Oct 2020 18:39:16 +0200
Subject: [PATCH] - menu code update.

---
 wadsrc/static/zscript/base.zs                 |  1 +
 wadsrc/static/zscript/ui/menu/listmenu.zs     | 22 ++++++--
 wadsrc/static/zscript/ui/menu/optionmenu.zs   | 50 +++++++++++--------
 .../static/zscript/ui/menu/optionmenuitems.zs | 39 ---------------
 4 files changed, 48 insertions(+), 64 deletions(-)

diff --git a/wadsrc/static/zscript/base.zs b/wadsrc/static/zscript/base.zs
index 7f50c46c9..68a8361d3 100644
--- a/wadsrc/static/zscript/base.zs
+++ b/wadsrc/static/zscript/base.zs
@@ -369,6 +369,7 @@ struct CVar native
 	native void SetString(String s);
 	native int GetRealType();
 	native int ResetToDefault();
+	native int GetGlyphHeight(String charcode);
 }
 
 struct GIFont version("2.4")
diff --git a/wadsrc/static/zscript/ui/menu/listmenu.zs b/wadsrc/static/zscript/ui/menu/listmenu.zs
index 76b384ba6..74efc6bd4 100644
--- a/wadsrc/static/zscript/ui/menu/listmenu.zs
+++ b/wadsrc/static/zscript/ui/menu/listmenu.zs
@@ -191,9 +191,25 @@ class ListMenu : Menu
 	{
 		int sel = -1;
 
-		// convert x/y from screen to virtual coordinates, according to CleanX/Yfac use in DrawTexture
-		x = ((x - (screen.GetWidth() / 2)) / CleanXfac) + 160;
-		y = ((y - (screen.GetHeight() / 2)) / CleanYfac) + 100;
+		int w = mDesc.DisplayWidth();
+		double sx, sy;
+		if (w == ListMenuDescriptor.CleanScale)
+		{
+			// convert x/y from screen to virtual coordinates, according to CleanX/Yfac use in DrawTexture
+			x = ((x - (screen.GetWidth() / 2)) / CleanXfac) + 160;
+			y = ((y - (screen.GetHeight() / 2)) / CleanYfac) + 100;
+		}
+		else
+		{
+			// for fullscreen scale, transform coordinates so that for the given rect the coordinates are within (0, 0, w, h)
+			int h = mDesc.DisplayHeight();
+			double fx, fy, fw, fh;
+			[fx, fy, fw, fh] = Screen.GetFullscreenRect(w, h, FSMode_ScaleToFit43);
+			
+			x = int((x - fx) * w / fw);
+			y = int((y - fy) * h / fh);
+		}
+
 
 		if (mFocusControl != NULL)
 		{
diff --git a/wadsrc/static/zscript/ui/menu/optionmenu.zs b/wadsrc/static/zscript/ui/menu/optionmenu.zs
index 14a2f95ab..ac136338a 100644
--- a/wadsrc/static/zscript/ui/menu/optionmenu.zs
+++ b/wadsrc/static/zscript/ui/menu/optionmenu.zs
@@ -239,15 +239,7 @@ class OptionMenu : Menu
 
 					if (y <= 0)
 					{
-						let font = generic_ui || !mDesc.mFont? NewSmallFont : mDesc.mFont;
-						if (font && mDesc.mTitle.Length() > 0)
-						{
-							y = -y + font.GetHeight();
-						}
-						else
-						{
-							y = -y;
-						}
+						y = DrawCaption(mDesc.mTitle, y, false);
 					}
 					y *= CleanYfac_1;
 					int	rowheight = OptionMenuSettings.mLinespacing * CleanYfac_1;
@@ -430,25 +422,39 @@ class OptionMenu : Menu
 		return screen.GetWidth() / 2 + indent * CleanXfac_1;
 	}
 
+	//=============================================================================
+	//
+	// draws and/or measures the caption. 
+	//
+	//=============================================================================
+
+	virtual int DrawCaption(String title, int y, bool drawit)
+	{
+		let font = generic_ui || !mDesc.mFont ? NewSmallFont : mDesc.mFont;
+		if (font && mDesc.mTitle.Length() > 0)
+		{
+			return menuCustomizer.DrawCaption(title, font, y, drawit);
+		}
+		else
+		{
+			return y;
+		}
+
+	}
+
+	//=============================================================================
+	//
+	//
+	//
+	//=============================================================================
+
 	override void Drawer ()
 	{
 		int y = mDesc.mPosition;
 
 		if (y <= 0)
 		{
-			let font = generic_ui || !mDesc.mFont? NewSmallFont : mDesc.mFont;
-			if (font && mDesc.mTitle.Length() > 0)
-			{
-				let tt = Stringtable.Localize(mDesc.mTitle);
-				screen.DrawText (font, OptionMenuSettings.mTitleColor,
-					(screen.GetWidth() - font.StringWidth(tt) * CleanXfac_1) / 2, 10*CleanYfac_1,
-					tt, DTA_CleanNoMove_1, true);
-				y = -y + font.GetHeight();
-			}
-			else
-			{
-				y = -y;
-			}
+			y = DrawCaption(mDesc.mTitle, -y, true);
 		}
 		mDesc.mDrawTop = y;
 		int fontheight = OptionMenuSettings.mLinespacing * CleanYfac_1;
diff --git a/wadsrc/static/zscript/ui/menu/optionmenuitems.zs b/wadsrc/static/zscript/ui/menu/optionmenuitems.zs
index 95a27d055..28b48310b 100644
--- a/wadsrc/static/zscript/ui/menu/optionmenuitems.zs
+++ b/wadsrc/static/zscript/ui/menu/optionmenuitems.zs
@@ -1234,42 +1234,3 @@ class OptionMenuItemScaleSlider : OptionMenuItemSlider
 	
 }
 
-//=============================================================================
-//
-// Placeholder classes for overhauled video mode menu. Do not use!
-// Their sole purpose is to support mods with full copy of embedded MENUDEF
-//
-//=============================================================================
-
-class OptionMenuItemScreenResolution : OptionMenuItem
-{
-	String mResTexts[3];
-	int mSelection;
-	int mHighlight;
-	int mMaxValid;
-
-	enum EValues
-	{
-		SRL_INDEX = 0x30000,
-		SRL_SELECTION = 0x30003,
-		SRL_HIGHLIGHT = 0x30004,
-	};
-
-	OptionMenuItemScreenResolution Init(String command)
-	{
-		return self;
-	}
-
-	override bool Selectable()
-	{
-		return false;
-	}
-}
-
-class VideoModeMenu : OptionMenu
-{
-	static bool SetSelectedSize()
-	{
-		return false;
-	}
-}