Merge pull request #19 from cyotek/autos-refactoring

Auto generated member refactoring

CHANGELOG.md

@@ -8,11 +8,25 @@
   4.6.2, 4.6.2, 4.8, .NET Standard 2.0, .NET Standard 2.1, .NET
   Core 2.1, .NET Core 2.2, and .NET Core 3.0
 * Added support for BMFont version 3 binary fonts
+* Added additional constructor to `Character` struct
+* Added `X`, `Y`, `Width` and `Height` properties to the
+  `Character` class
+* Added `OffsetX` and `OffsetY` properties to the `Character`
+  class
 
 ### Changed
 
 * Performance improvements when loading text fonts
 
+### Deprecated
+
+* The `Bounds` property has been deprecated and will be removed
+  in a future version. The `X`, `Y`, `Width` and `Height`
+  properties should be used instead
+* The `Offset` property has been deprecated and will be removed
+  in a future version. The `OffsetX` and `OffsetY` properties
+  should be used instead
+
 ### Removed
 
 * Due to switch to SDK projects, the .NET Framework 2.0 target

fontviewer/MainForm.cs

@@ -1,4 +1,4 @@
-/* AngelCode bitmap font parsing using C#
+/* AngelCode bitmap font parsing using C#
  * http://www.cyotek.com/blog/angelcode-bitmap-font-parsing-using-csharp
  *
  * Copyright © 2012-2015 Cyotek Ltd.
@@ -41,7 +41,7 @@ public MainForm()
 
     #region Methods
 
-    private void charListBox_SelectedIndexChanged(object sender, EventArgs e)
+    private void CharListBox_SelectedIndexChanged(object sender, EventArgs e)
     {
       Character character;
 
@@ -62,7 +62,8 @@ private void charListBox_SelectedIndexChanged(object sender, EventArgs e)
     private void DrawCharacter(Graphics g, Character character, int x, int y)
     {
       g.DrawImage(_textures[character.TexturePage],
-                  new RectangleF(x, y, character.Bounds.Width, character.Bounds.Height), character.Bounds,
+                  new RectangleF(x, y, character.Width, character.Height),
+                  new Rectangle(character.X, character.Y, character.Width, character.Height),
                   GraphicsUnit.Pixel);
     }
 
@@ -105,7 +106,7 @@ private void DrawPreview()
                 data = _font[character];
                 kerning = _font.GetKerning(previousCharacter, character);
 
-                this.DrawCharacter(g, data, x + data.Offset.X + kerning, y + data.Offset.Y);
+                this.DrawCharacter(g, data, x + data.XOffset + kerning, y + data.YOffset);
 
                 x += data.XAdvance + kerning;
                 break;
@@ -119,7 +120,7 @@ private void DrawPreview()
       }
     }
 
-    private void exitToolStripMenuItem_Click(object sender, EventArgs e)
+    private void ExitToolStripMenuItem_Click(object sender, EventArgs e)
     {
       this.Close();
     }
@@ -181,29 +182,29 @@ private void OpenFont(string fileName)
       }
 
       // force any preview text to update
-      this.previewTextBox_TextChanged(previewTextBox, EventArgs.Empty);
+      this.PreviewTextBox_TextChanged(previewTextBox, EventArgs.Empty);
     }
 
-    private void openToolStripMenuItem_Click(object sender, EventArgs e)
+    private void OpenToolStripMenuItem_Click(object sender, EventArgs e)
     {
       if (openFileDialog.ShowDialog(this) == DialogResult.OK)
       {
         this.OpenFont(openFileDialog.FileName);
       }
     }
 
-    private void pageImageBox_Paint(object sender, PaintEventArgs e)
+    private void PageImageBox_Paint(object sender, PaintEventArgs e)
     {
-      if (!_currentCharacter.Bounds.IsEmpty)
+      if (_currentCharacter.Width > 0 && _currentCharacter.Height > 0)
       {
         using (Pen pen = new Pen(Color.Red))
         {
-          e.Graphics.DrawRectangle(pen, pageImageBox.GetOffsetRectangle(_currentCharacter.Bounds));
+          e.Graphics.DrawRectangle(pen, pageImageBox.GetOffsetRectangle(_currentCharacter.X, _currentCharacter.Y, _currentCharacter.Width, _currentCharacter.Height));
         }
       }
     }
 
-    private void previewTextBox_TextChanged(object sender, EventArgs e)
+    private void PreviewTextBox_TextChanged(object sender, EventArgs e)
     {
       if (previewImageBox.Image != null)
       {
@@ -227,7 +228,8 @@ private void SetCharacterImage(Character character)
         characterImageBox.Image = null;
       }
 
-      image = new Bitmap(character.Bounds.Width, character.Bounds.Height);
+      image = new Bitmap(character.Width, character.Height);
+
       using (Graphics g = Graphics.FromImage(image))
       {
         this.DrawCharacter(g, character, 0, 0);