From 377c34d9a538e78286e1347798963869f91856c4 Mon Sep 17 00:00:00 2001
From: gambas <g4mba5@gmail.com>
Date: Tue, 9 Feb 2021 02:51:20 +0100
Subject: [PATCH] Form editor: Correctly detect stacking order changes caused
 by automatic arrangement.

[DEVELOPMENT ENVIRONMENT]
* BUG: Form editor: Correctly detect stacking order changes caused by automatic arrangement.
---
 app/src/gambas3/.src/Editor/Form/FForm.class |  2 +-
 app/src/gambas3/.src/Editor/Form/FForm.form  | 52 ++++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/src/gambas3/.src/Editor/Form/FForm.class b/app/src/gambas3/.src/Editor/Form/FForm.class
index 5dd41600f..26d8be480 100644
--- a/app/src/gambas3/.src/Editor/Form/FForm.class
+++ b/app/src/gambas3/.src/Editor/Form/FForm.class
@@ -2114,7 +2114,7 @@ Private Sub ArrangeContainer(hParent As Container, sArr As String, Optional bInv
     sKey = GetSortKey(hCtrl, sArr, bInvert)
     cSortKey[hCtrl.Name] = sKey
     aPos.Add(sKey)
-    If sLastKey And If sKey >= sLastKey Then
+    If sLastKey And If sKey < sLastKey Then
       bModify = True
     Endif
     sLastKey = sKey
diff --git a/app/src/gambas3/.src/Editor/Form/FForm.form b/app/src/gambas3/.src/Editor/Form/FForm.form
index 0c83f966d..454770412 100644
--- a/app/src/gambas3/.src/Editor/Form/FForm.form
+++ b/app/src/gambas3/.src/Editor/Form/FForm.form
@@ -608,27 +608,6 @@
     MoveScaled(5,11,58,39)
     Expand = True
     Border = False
-    { panRight Panel Handle
-      Name = "panRight"
-      MoveScaled(8,16,1,1)
-      Background = Color.TextBackground
-      Mouse = Mouse.SizeE
-      Border = Border.Plain
-    }
-    { panDown Panel Handle
-      Name = "panDown"
-      MoveScaled(6,18,1,1)
-      Background = Color.TextBackground
-      Mouse = Mouse.SizeS
-      Border = Border.Plain
-    }
-    { panRightDown Panel Handle
-      Name = "panRightDown"
-      MoveScaled(8,18,1,1)
-      Background = Color.TextBackground
-      Mouse = Mouse.SizeNWSE
-      Border = Border.Plain
-    }
     { panTitle Panel
       MoveScaled(0,0,49,5)
       Background = Color.SelectedBackground
@@ -663,6 +642,32 @@
         }
       }
     }
+    { panMenuBar DrawingArea
+      MoveScaled(27,8,25,3)
+      Visible = False
+      Background = Color.Background
+    }
+    { panRight Panel Handle
+      Name = "panRight"
+      MoveScaled(8,16,1,1)
+      Background = Color.TextBackground
+      Mouse = Mouse.SizeE
+      Border = Border.Plain
+    }
+    { panDown Panel Handle
+      Name = "panDown"
+      MoveScaled(6,18,1,1)
+      Background = Color.TextBackground
+      Mouse = Mouse.SizeS
+      Border = Border.Plain
+    }
+    { panRightDown Panel Handle
+      Name = "panRightDown"
+      MoveScaled(8,18,1,1)
+      Background = Color.TextBackground
+      Mouse = Mouse.SizeNWSE
+      Border = Border.Plain
+    }
     { panBorder DrawingArea
       MoveScaled(29,13,24,24)
       Background = Color.Background
@@ -703,11 +708,6 @@
         NoBackground = True
       }
     }
-    { panMenuBar DrawingArea
-      MoveScaled(27,8,25,3)
-      Visible = False
-      Background = Color.Background
-    }
   }
   { dwgBackground DrawingArea
     MoveScaled(76,26,12,9)