From 6a3ac47f5472350443ae971309f437c3f48957f8 Mon Sep 17 00:00:00 2001
From: laurentgom <laurentgom@4e206d99-4929-0410-ac5d-dfc041789085>
Date: Thu, 24 Mar 2011 21:40:09 +0000
Subject: [PATCH] Renamed Text.Size to Text.CharacterSize in SFML.Net (sync
with C++ API)
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1816 4e206d99-4929-0410-ac5d-dfc041789085
---
bindings/dotnet/examples/shader/Shader.cs | 4 ++--
bindings/dotnet/src/Graphics/Text.cs | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bindings/dotnet/examples/shader/Shader.cs b/bindings/dotnet/examples/shader/Shader.cs
index e634b4e30..6d62ab803 100644
--- a/bindings/dotnet/examples/shader/Shader.cs
+++ b/bindings/dotnet/examples/shader/Shader.cs
@@ -124,7 +124,7 @@ namespace shader
// Define a string for displaying current effect description
shaderText = new Text();
shaderText.Font = font;
- shaderText.Size = 20;
+ shaderText.CharacterSize = 20;
shaderText.Position = new Vector2(5.0F, 0.0F);
shaderText.Color = new Color(250, 100, 30);
shaderText.DisplayedString = "Background shader: \"" + backgroundShader.Name + "\"\n" +
@@ -134,7 +134,7 @@ namespace shader
// Define a string for displaying help
Text infoText = new Text();
infoText.Font = font;
- infoText.Size = 20;
+ infoText.CharacterSize = 20;
infoText.Position = new Vector2(5.0F, 500.0F);
infoText.Color = new Color(250, 100, 30);
infoText.DisplayedString = "Move your mouse to change the shaders' parameters\n" +
diff --git a/bindings/dotnet/src/Graphics/Text.cs b/bindings/dotnet/src/Graphics/Text.cs
index 7675186a0..16d129875 100644
--- a/bindings/dotnet/src/Graphics/Text.cs
+++ b/bindings/dotnet/src/Graphics/Text.cs
@@ -73,14 +73,14 @@ namespace SFML
/// </summary>
/// <param name="str">String to display</param>
/// <param name="font">Font to use</param>
- /// <param name="size">Base characters size</param>
+ /// <param name="characterSize">Base characters size</param>
////////////////////////////////////////////////////////////
- public Text(string str, Font font, uint size) :
+ public Text(string str, Font font, uint characterSize) :
base(sfText_Create())
{
DisplayedString = str;
Font = font;
- Size = size;
+ CharacterSize = characterSize;
}
////////////////////////////////////////////////////////////
@@ -223,7 +223,7 @@ namespace SFML
/// Base size of characters
/// </summary>
////////////////////////////////////////////////////////////
- public uint Size
+ public uint CharacterSize
{
get {return sfText_GetCharacterSize(This);}
set {sfText_SetCharacterSize(This, value);}
@@ -285,7 +285,7 @@ namespace SFML
" BlendMode(" + BlendMode + ")" +
" String(" + DisplayedString + ")" +
" Font(" + Font + ")" +
- " Size(" + Size + ")" +
+ " CharacterSize(" + CharacterSize + ")" +
" Style(" + Style + ")" +
" Rectangle(" + GetRect() + ")";
}