FIX: Reordering now that Items are drawn in reverse order

Author: DevinDow

ImageItem.cs

@@ -77,17 +77,15 @@ public void Draw(Graphics g, int x, int y, float rotation, float scale, bool sel
                 float numSize = handleSize * 4;
                 Brush brush = Brushes.Red;
                 if (VisionBoard.Current.OrderIndex < VisionBoard.Current.ReorderCurrentIndex)
-                {
                     brush = Brushes.Green;
-                }
                 g.FillRectangle(brush, -numSize, -numSize, numSize * 2, numSize * 2);
 
                 Font font = new Font(FontFamily.GenericSerif, numSize);
                 StringFormat format = new StringFormat();
                 format.Alignment = StringAlignment.Center;
                 format.LineAlignment = StringAlignment.Center;
-                g.DrawString((VisionBoard.Current.OrderIndex+1).ToString(), font, Brushes.Black, 0, 0, format);
-                VisionBoard.Current.OrderIndex++;
+                g.DrawString(VisionBoard.Current.OrderIndex.ToString(), font, Brushes.Black, 0, 0, format);
+                VisionBoard.Current.OrderIndex--;
             }
 
             // Selected

MainForm.cs

@@ -61,18 +61,13 @@ private void MainForm_Paint(object sender, PaintEventArgs e)
             // Reordering
             if (VisionBoard.Current.Reordering)
             {
-                VisionBoard.Current.OrderIndex = 0;
+                VisionBoard.Current.OrderIndex = VisionBoard.Current.Items.Count;
                 VisionBoard.Current.Draw(bitmapG);
             }
             else
             {
                 // Draw Non-Selected to Bitmap
-                for (int i = VisionBoard.Current.Items.Count - 1; i >= 0; i--)
-                {
-                    ImageItem item = (ImageItem)VisionBoard.Current.Items[i];
-                    if (item != selectedItem)
-                        item.Draw(bitmapG);
-                }
+                VisionBoard.Current.Draw(bitmapG, selectedItem);
 
                 // Draw Selected to Bitmap
                 if (selectedItem != null)
@@ -171,7 +166,7 @@ private void MainForm_MouseDown(object sender, MouseEventArgs e)
                 {
                     ImageItem item = (ImageItem)VisionBoard.Current.Items[i];
 
-                    if (VisionBoard.Current.Reordering && VisionBoard.Current.ReorderCurrentIndex > i)
+                    if (VisionBoard.Current.Reordering && VisionBoard.Current.ReorderCurrentIndex - 1 > i)
                         continue;
 
                     if (item.HitTest(clickedPoint.X, clickedPoint.Y))
@@ -188,16 +183,16 @@ private void MainForm_MouseDown(object sender, MouseEventArgs e)
                 if (VisionBoard.Current.Reordering && selectedIndex >= 0)
                 {
                     // change order
-                    if (selectedIndex != VisionBoard.Current.ReorderCurrentIndex)
+                    if (selectedIndex != VisionBoard.Current.ReorderCurrentIndex - 1)
                     {
                         VisionBoard.Current.Items.RemoveAt(selectedIndex);
-                        VisionBoard.Current.Items.Insert(VisionBoard.Current.ReorderCurrentIndex, selectedItem);
+                        VisionBoard.Current.Items.Insert(VisionBoard.Current.ReorderCurrentIndex - 1, selectedItem);
                         VisionBoard.Current.IsDirty = true;
                     }
 
                     // increment ReorderCurrentIndex
                     VisionBoard.Current.ReorderCurrentIndex++;
-                    if (VisionBoard.Current.ReorderCurrentIndex >= VisionBoard.Current.Items.Count)
+                    if (VisionBoard.Current.ReorderCurrentIndex > VisionBoard.Current.Items.Count)
                         VisionBoard.Current.Reordering = false;
 
                     selectedItem = null;
@@ -346,7 +341,7 @@ private void miReorder_Click(object sender, EventArgs e)
         {
             selectedItem = null;
             VisionBoard.Current.Reordering = !VisionBoard.Current.Reordering;
-            VisionBoard.Current.ReorderCurrentIndex = 0;
+            VisionBoard.Current.ReorderCurrentIndex = 1;
             Invalidate();
         }