Read-from-memory fixes, render target improvements

BeefLibs/Beefy2D/src/BFWindow.bf

@@ -110,7 +110,7 @@ namespace Beefy
 
         public virtual void PreDraw(Graphics g)
         {
-            g.PushDrawLayer(mDefaultDrawLayer);            
+            g.PushDrawLayer(mDefaultDrawLayer);
         }
 
         public virtual void PostDraw(Graphics g)

BeefLibs/Beefy2D/src/gfx/DrawLayer.bf

@@ -13,6 +13,8 @@ namespace Beefy.gfx
 #if !STUDIO_CLIENT
     public class DrawLayer
     {
+		public static List<DrawLayer> sDrawLayers = new .() ~ delete _;
+
         [CallingConvention(.Stdcall), CLink]
         static extern void* DrawLayer_Create(void* window);
 
@@ -33,10 +35,12 @@ namespace Beefy.gfx
         public this(BFWindow window)
         {
             mNativeDrawLayer = DrawLayer_Create((window != null) ? (window.mNativeWindow) : null);
+			sDrawLayers.Add(this);
         }
 
         public ~this()
         {
+			sDrawLayers.Remove(this);
             DrawLayer_Delete(mNativeDrawLayer);
         }
 

BeefLibs/Beefy2D/src/gfx/Font.bf

@@ -6,6 +6,7 @@ using Beefy.geom;
 using Beefy.utils;
 using System.Diagnostics;
 using System.Threading;
+using res;
 
 namespace Beefy.gfx
 {
@@ -515,6 +516,14 @@ namespace Beefy.gfx
 
 		void GetFontPath(StringView fontName, String path)
 		{
+			if (fontName.StartsWith('['))
+			{
+				path.Set(fontName);
+				if (FilePackManager.TryMakeMemoryString(path))
+					return;
+				path.Clear();
+			}
+
 			if (fontName.Contains('.'))
 			{
 				Path.GetAbsolutePath(fontName, BFApp.sApp.mInstallDir, path);
@@ -1014,6 +1023,8 @@ namespace Beefy.gfx
 				}
 
                 CharData charData = GetCharData(c);
+				if (charData == null)
+					continue;
 				float drawX = curX + charData.mXOffset;
 				float drawY = curY + charData.mYOffset;
 				

BeefLibs/Beefy2D/src/res/FilePack.bf

@@ -561,9 +561,10 @@ static class FilePackManager
 	{
 		if (TryGetMemory(path) case .Ok(let val))
 		{
+			String prevPath = scope .()..Append(path);
+
 			var ext = Path.GetExtension(path, .. scope .());
-			path.Set(scope $"@{(int)(void*)val.Ptr:X}:{val.Length}");
-			path.Append(ext);
+			path.Set(scope $"@{(int)(void*)val.Ptr:X}:{val.Length}:{prevPath}");
 			return true;
 		}
 		return false;

BeefLibs/Beefy2D/src/theme/dark/DarkButton.bf

@@ -14,7 +14,7 @@ namespace Beefy.theme.dark
 		public float mLabelYOfs;
 
         [DesignEditable(DefaultEditString=true)]
-		public String Label
+		public StringView Label
 		{
 			get
 			{

BeefLibs/Beefy2D/src/widgets/WidgetWindow.bf

@@ -69,6 +69,7 @@ namespace Beefy.widgets
 		public bool mWantsUpdateF;
 		public bool mTempWantsUpdateF;
 
+		public Image mContentRenderTarget ~ delete _;
         public int32 mContentClientWidth;
         public int32 mContentClientHeight;
 
@@ -229,11 +230,31 @@ namespace Beefy.widgets
         public override void PreDraw(Graphics g)
         {
             base.PreDraw(g);
+			
+			if (mContentRenderTarget != null)
+			{
+				g.mMatrix.Set(Matrix.IdentityMatrix);
+			}
+			else
+			{
+				g.mMatrix.Set(mScaleMatrix);
+			}
 
-            g.mMatrix.Set(mScaleMatrix);
 			g.mMatrixStack[g.mMatrixStackIdx] = g.mMatrix;
         }
 
+		public override void PostDraw(Graphics g)
+		{
+			base.PostDraw(g);
+
+			if (mContentRenderTarget != null)
+			{
+				for (var drawLayer in DrawLayer.sDrawLayers)
+					drawLayer.DrawToRenderTarget(mContentRenderTarget);
+				g.DrawQuad(mContentRenderTarget, 0, 0, 0, 0, mClientWidth, mClientHeight, 1, 1);
+			}
+		}
+
 		public override void RehupSize()
 		{
 			base.RehupSize();
@@ -880,8 +901,14 @@ namespace Beefy.widgets
 			mMouseFlags = default;
 		}
 		
-		public void SetContentSize(int width, int height)
+		public void SetContentSize(int width, int height, bool createRenderTarget = false)
 		{
+			DeleteAndNullify!(mContentRenderTarget);
+			if (createRenderTarget)
+			{
+				mContentRenderTarget = Image.CreateRenderTarget((.)width, (.)height);
+			}
+
 			mContentClientWidth = (.)width;
 			mContentClientHeight = (.)height;
 			RehupSize();