From fd7b3ae3a337ba82479ce527cedef0d213040d8c Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Fri, 10 May 2013 19:36:58 +0200 Subject: [PATCH] fixed some merge errors --- Vocaluxe/Base/Fonts/CGlyph.cs | 2 +- VocaluxeLib/IBasic.cs | 7 ++----- VocaluxeLib/Menu/CText.cs | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Vocaluxe/Base/Fonts/CGlyph.cs b/Vocaluxe/Base/Fonts/CGlyph.cs index 453301ad..1b2a9483 100644 --- a/Vocaluxe/Base/Fonts/CGlyph.cs +++ b/Vocaluxe/Base/Fonts/CGlyph.cs @@ -23,7 +23,7 @@ using System.Drawing.Drawing2D; using System.Drawing.Imaging; using System.Drawing.Text; using System.Runtime.InteropServices; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Base.Fonts { diff --git a/VocaluxeLib/IBasic.cs b/VocaluxeLib/IBasic.cs index fe92c5b8..eadd5f58 100644 --- a/VocaluxeLib/IBasic.cs +++ b/VocaluxeLib/IBasic.cs @@ -114,12 +114,9 @@ namespace VocaluxeLib public interface IDrawing { - RectangleF GetTextBounds(CText text); - void DrawTexture(STexture texture, SRectF rect); void DrawTexture(STexture texture, SRectF rect, SColorF color); - void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds); - void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored); + void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false); void DrawTextureReflection(STexture texture, SRectF rect, SColorF color, SRectF bounds, float reflectionSpace, float reflectionHeight); STexture AddTexture(string fileName); @@ -148,7 +145,7 @@ namespace VocaluxeLib void SetFont(string fontName); void SetStyle(EStyle fontStyle); - RectangleF GetTextBounds(CText text, float textHeight); + RectangleF GetTextBounds(CText text); 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); diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs index ac8bd1c8..880cb6d0 100644 --- a/VocaluxeLib/Menu/CText.cs +++ b/VocaluxeLib/Menu/CText.cs @@ -579,7 +579,7 @@ namespace VocaluxeLib.Menu break; } - bounds = CBase.Fonts.GetTextBounds(this, h); + bounds = CBase.Fonts.GetTextBounds(this); } float x = X;