- CalculateImageWidth() no longer adds 2 to the image width

- Fix calculation of cell edit boundaries on TreeListView controls
- Fix some spelling mistakes

git-svn-id: https://svn.code.sf.net/p/objectlistview/code/cs/trunk@811 0bec5ed8-b53f-49e6-9885-ce7bc93af311

Author: grammarian

ObjectListView/Rendering/Renderers.cs

@@ -5,13 +5,16 @@
  * Date: 27/09/2008 9:15 AM
  *
  * Change log: 
+ * v2.9.2
+ * 2016-06-02   JPP  - CalculateImageWidth() no longer adds 2 to the image width
+ * 2016-05-29   JPP  - Fix calculation of cell edit boundaries on TreeListView controls
  * v2.9
  * 2015-08-22   JPP  - Allow selected row back/fore colours to be specified for each row
  * 2015-06-23   JPP  - Added ColumnButtonRenderer plus general support for Buttons
  * 2015-06-22   JPP  - Added BaseRenderer.ConfigureItem() and ConfigureSubItem() to easily allow
  *                     other renderers to be chained for use within a primary renderer.
  *                   - Lots of tightening of hit tests and edit rectangles
- * 2015-05-15   JPP  - Handle renderering an Image when that Image is returned as an aspect.
+ * 2015-05-15   JPP  - Handle rendering an Image when that Image is returned as an aspect.
  * v2.8
  * 2014-09-26   JPP  - Dispose of animation timer in a more robust fashion.
  * 2014-05-20   JPP  - Handle rendering disabled rows
@@ -305,7 +308,7 @@ public Rectangle? CellPadding {
         private Rectangle? cellPadding;
 
         /// <summary>
-        /// Gets the horiztonal alignment of the column
+        /// Gets the horizontal alignment of the column
         /// </summary>
         [Browsable(false)]
         public HorizontalAlignment CellHorizontalAlignment
@@ -825,7 +828,7 @@ protected virtual Size CalculatePrimaryCheckBoxSize(Graphics g) {
         /// <returns></returns>
         protected virtual int CalculateImageWidth(Graphics g, object imageSelector)
         {
-            return this.CalculateImageSize(g, imageSelector).Width + 2;
+            return this.CalculateImageSize(g, imageSelector).Width;
         }
 
         /// <summary>
@@ -909,7 +912,7 @@ protected virtual Size CalculateTextSize(Graphics g, string txt, int width)
                 return TextRenderer.MeasureText(g, txt, this.Font, proposedSize, NormalTextFormatFlags);
             }
 
-            // Using GDI+ renderering
+            // Using GDI+ rendering
             using (StringFormat fmt = new StringFormat()) {
                 fmt.Trimming = StringTrimming.EllipsisCharacter;
                 SizeF sizeF = g.MeasureString(txt, this.Font, width, fmt);
@@ -1319,7 +1322,7 @@ protected virtual void StandardHitTest(Graphics g, OlvListViewHitTestInfo hti, R
             width = this.CalculateImageWidth(g, this.GetImageSelector());
             Rectangle rTwo = r;
             rTwo.Width = width;
-            // g.DrawRectangle(Pens.Red, rTwo);
+            //g.DrawRectangle(Pens.Red, rTwo);
             if (rTwo.Contains(x, y)) {
                 if (this.Column != null && (this.Column.Index > 0 && this.Column.CheckBoxes))
                     hti.HitTestLocation = HitTestLocation.CheckBox;
@@ -1362,12 +1365,12 @@ protected virtual Rectangle StandardGetEditRectangle(Graphics g, Rectangle cellB
             Size checkBoxSize = this.CalculatePrimaryCheckBoxSize(g);
             int imageWidth = this.CalculateImageWidth(g, this.GetImageSelector());
 
-            int width = checkBoxSize.Width + imageWidth;
+            int width = checkBoxSize.Width + imageWidth + 2;
 
             // Indent the primary column by the required amount
-            if (this.ListItem.IndentCount > 0) {
+            if (this.ColumnIsPrimary && this.ListItem.IndentCount > 0) {
                 int indentWidth = this.ListView.SmallImageSize.Width * this.ListItem.IndentCount;
-                width += indentWidth;
+                editControlBounds.X += indentWidth;
             }
 
             editControlBounds.X += width;
@@ -3496,7 +3499,7 @@ public Color DescriptionColorOrDefault {
         /// Gets or sets the number of pixels that will be left between the image and the text
         /// </summary>
         [Category("ObjectListView"),
-         Description("The number of pixels that that will be left between the image and the text"),
+         Description("The number of pixels that will be left between the image and the text"),
          DefaultValue(4)]
         public int ImageTextSpace
         {