fixed merge error

VocaluxeLib/IBasic.cs

@@ -146,6 +146,7 @@ namespace VocaluxeLib
         void SetStyle(EStyle fontStyle);
 
         RectangleF GetTextBounds(CText text);
+        RectangleF GetTextBounds(CText text, float textHeight);
 
         void DrawText(string text, float textHeight, float x, float y, float z, SColorF color);
         void DrawTextReflection(string text, float textHeight, float x, float y, float z, SColorF color, float reflectionSpace, float reflectionHeight);

VocaluxeLib/Menu/CText.cs

@@ -579,7 +579,7 @@ namespace VocaluxeLib.Menu
                         break;
                 }
 
-                bounds = CBase.Fonts.GetTextBounds(this);
+                bounds = CBase.Fonts.GetTextBounds(this, h);
             }
 
             float x = X;