mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-12-01 15:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed Text.Size to Text.CharacterSize in SFML.Net (sync with C++ API)

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1816 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
laurentgom 2011-03-24 21:40:09 +00:00
parent 149a724dea
commit 6a3ac47f54
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bindings/dotnet/examples/shader/Shader.cs
View File

@ -124,7 +124,7 @@ namespace shader
// Define a string for displaying current effect description // Define a string for displaying current effect description
shaderText = new Text(); shaderText = new Text();
shaderText.Font = font; shaderText.Font = font;
shaderText.Size = 20; shaderText.CharacterSize = 20;
shaderText.Position = new Vector2(5.0F, 0.0F); shaderText.Position = new Vector2(5.0F, 0.0F);
shaderText.Color = new Color(250, 100, 30); shaderText.Color = new Color(250, 100, 30);
shaderText.DisplayedString = "Background shader: \"" + backgroundShader.Name + "\"\n" + shaderText.DisplayedString = "Background shader: \"" + backgroundShader.Name + "\"\n" +
@ -134,7 +134,7 @@ namespace shader
// Define a string for displaying help // Define a string for displaying help
Text infoText = new Text(); Text infoText = new Text();
infoText.Font = font; infoText.Font = font;
infoText.Size = 20; infoText.CharacterSize = 20;
infoText.Position = new Vector2(5.0F, 500.0F); infoText.Position = new Vector2(5.0F, 500.0F);
infoText.Color = new Color(250, 100, 30); infoText.Color = new Color(250, 100, 30);
infoText.DisplayedString = "Move your mouse to change the shaders' parameters\n" + infoText.DisplayedString = "Move your mouse to change the shaders' parameters\n" +

10
bindings/dotnet/src/Graphics/Text.cs
View File

@ -73,14 +73,14 @@ namespace SFML
/// </summary> /// </summary>
/// <param name="str">String to display</param> /// <param name="str">String to display</param>
/// <param name="font">Font to use</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()) base(sfText_Create())
{ {
DisplayedString = str; DisplayedString = str;
Font = font; Font = font;
Size = size; CharacterSize = characterSize;
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -223,7 +223,7 @@ namespace SFML
/// Base size of characters /// Base size of characters
/// </summary> /// </summary>
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
public uint Size public uint CharacterSize
{ {
get {return sfText_GetCharacterSize(This);} get {return sfText_GetCharacterSize(This);}
set {sfText_SetCharacterSize(This, value);} set {sfText_SetCharacterSize(This, value);}
@ -285,7 +285,7 @@ namespace SFML
" BlendMode(" + BlendMode + ")" + " BlendMode(" + BlendMode + ")" +
" String(" + DisplayedString + ")" + " String(" + DisplayedString + ")" +
" Font(" + Font + ")" + " Font(" + Font + ")" +
" Size(" + Size + ")" + " CharacterSize(" + CharacterSize + ")" +
" Style(" + Style + ")" + " Style(" + Style + ")" +
" Rectangle(" + GetRect() + ")"; " Rectangle(" + GetRect() + ")";
} }