fixed some merge errors
This commit is contained in:
1 parent
4161652a1d
commit
fd7b3ae3a3
3 files changed
+4
-7
No files matched your search
@@ -23,7 +23,7 @@ using System.Drawing.Drawing2D;
|
|||||||
using System.Drawing.Imaging;
|
using System.Drawing.Imaging;
|
||||||
using System.Drawing.Text;
|
using System.Drawing.Text;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using VocaluxeLib.Menu;
|
using VocaluxeLib;
|
||||||
|
|
||||||
namespace Vocaluxe.Base.Fonts
|
namespace Vocaluxe.Base.Fonts
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -114,12 +114,9 @@ namespace VocaluxeLib
|
|||||||
|
|
||||||
public interface IDrawing
|
public interface IDrawing
|
||||||
{
|
{
|
||||||
RectangleF GetTextBounds(CText text);
|
|
||||||
|
|
||||||
void DrawTexture(STexture texture, SRectF rect);
|
void DrawTexture(STexture texture, SRectF rect);
|
||||||
void DrawTexture(STexture texture, SRectF rect, SColorF color);
|
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 = false);
|
||||||
void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored);
|
|
||||||
void DrawTextureReflection(STexture texture, SRectF rect, SColorF color, SRectF bounds, float reflectionSpace, float reflectionHeight);
|
void DrawTextureReflection(STexture texture, SRectF rect, SColorF color, SRectF bounds, float reflectionSpace, float reflectionHeight);
|
||||||
|
|
||||||
STexture AddTexture(string fileName);
|
STexture AddTexture(string fileName);
|
||||||
@@ -148,7 +145,7 @@ namespace VocaluxeLib
|
|||||||
void SetFont(string fontName);
|
void SetFont(string fontName);
|
||||||
void SetStyle(EStyle fontStyle);
|
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 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);
|
void DrawTextReflection(string text, float textHeight, float x, float y, float z, SColorF color, float reflectionSpace, float reflectionHeight);
|
||||||
|
|||||||
@@ -579,7 +579,7 @@ namespace VocaluxeLib.Menu
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
bounds = CBase.Fonts.GetTextBounds(this, h);
|
bounds = CBase.Fonts.GetTextBounds(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
float x = X;
|
float x = X;
|
||||||
|
|||||||
Reference in new issue
Block a user