new editor features

2.10/Source/Editor.dfm

@@ -182,7 +182,7 @@ object EditForm: TEditForm
       object tbAutoEditMode: TToolButton
         Left = 191
         Top = 0
-        Hint = 'Auto edit mode'
+        Hint = 'Extended edit mode'
         Caption = 'Auto'
         Down = True
         Grouped = True
@@ -1312,7 +1312,7 @@ object EditForm: TEditForm
               Width = 88
               Height = 21
               Cursor = crHandPoint
-              Hint = '"Weight" is the probability of this transform to be applied'
+              Hint = 'Click and drag to change value'
               Alignment = taLeftJustify
               BevelOuter = bvLowered
               Caption = ' Weight:'
@@ -1389,6 +1389,7 @@ object EditForm: TEditForm
               Top = 122
               Width = 57
               Height = 21
+              Hint = '"Weight" is the probability of this transform to be applied'
               TabOrder = 6
               Text = '0'
               OnExit = txtPExit
@@ -1551,7 +1552,7 @@ object EditForm: TEditForm
                 Width = 73
                 Height = 21
                 Cursor = crHandPoint
-                Hint = 'Symmetry'
+                Hint = 'Click and drag to change value'
                 Alignment = taLeftJustify
                 BevelOuter = bvLowered
                 Caption = ' Symmetry:'
@@ -1581,7 +1582,10 @@ object EditForm: TEditForm
                 Width = 73
                 Height = 21
                 Cursor = crHandPoint
+                Hint = 'Click and drag to change value'
                 BevelOuter = bvLowered
+                ParentShowHint = False
+                ShowHint = True
                 TabOrder = 1
                 OnDblClick = DragPanelDblClick
                 OnMouseDown = DragPanelMouseDown
@@ -1722,7 +1726,7 @@ object EditForm: TEditForm
     object mnuAutoZoom: TMenuItem
       Caption = 'Auto Zoom'
       Hint = 'Zoom to fit all triangles'
-      ImageIndex = 20
+      ImageIndex = 21
       OnClick = mnuAutoZoomClick
     end
     object mnuShowVarPreview: TMenuItem
@@ -1789,7 +1793,7 @@ object EditForm: TEditForm
     Left = 313
     Top = 40
     Bitmap = {
-      494C010118001D00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C01011A001D00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000008000000001002000000000000080
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1921,6 +1925,7 @@ object EditForm: TEditForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000600000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1928,6 +1933,7 @@ object EditForm: TEditForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000600000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1935,6 +1941,7 @@ object EditForm: TEditForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000600000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1942,68 +1949,96 @@ object EditForm: TEditForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000600000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000600000000000
+      0000600000000000000060000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000006000
+      0000600000006000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000006000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000600000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000060000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000600000006000000060000000600000006000
+      0000600000006000000060000000600000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000005454
+      5400000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000600000000000000000000000000000005454
+      5400000000000000000060000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000545454000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000600000000000000000000000545454000000
+      0000000000006000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000600000000000000000000000000000000000000054545400000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000600000000000000054545400000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000006000000000000000000000005454540000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000600000005454540000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000006000000060000000600000006000
+      0000600000006000000060000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000600000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000006000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000006000000000000000600000000000000060000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000600000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000060000000600000006000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -2011,36 +2046,7 @@ object EditForm: TEditForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000600000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -2053,25 +2059,25 @@ object EditForm: TEditForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000600000000000000000000000000000000000
+      000000000000000000000000000000000000000000005C5C5C00000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000005C5C5C0000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000600000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000600000000000000000000000000000000000
+      0000000000000000000000000000000000005C5C5C0000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000005C5C5C00000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000600000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000005C5C5C00000000005C5C5C0000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000600000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000600000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000600000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -2079,31 +2085,31 @@ object EditForm: TEditForm
       0000000000006000000000000000600000000000000060000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000600000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000060000000600000006000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000600000000000
+      0000000000000000000000000000000000000000000000000000000000000000
-      0000600000000000000060000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000006000
       0000000000000000000000000000600000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000006000
+      0000000000000000000000000000000000000000000000000000000000000000
-      0000600000006000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000054545400000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       00006000000000000000FFFFFF00FFFFFF00FFFFFF0000000000000000000000
+      00000000000000000000000000000000000000000000000000005C5C5C000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      00005C5C5C000000000000000000000000000000000000000000000000000000
-      0000600000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000005454540000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -2117,16 +2123,16 @@ object EditForm: TEditForm
       0000000000000000000000000000000000000000000000000000000000005454
       5400000000000000000000000000000000000000000000000000000000000000
       00006000000000000000FFFFFF00FFFFFF00FFFFFF0000000000000000005454
-      5400000000000000000000000000000000000000000000000000000000000000
+      54000000000000000000000000000000000000000000000000005C5C5C000000
-      0000000000000000000000000000000000000000000000000000000000005454
+      0000000000000000000000000000000000000000000000000000000000000000
-      5400000000000000000000000000000000000000000000000000000000000000
+      00005C5C5C000000000000000000000000000000000000000000000000000000
       0000000000000000000054545400000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000545454000000
       0000000000000000000000000000000000000000000000000000000000006000
       0000000000000000000000000000000000000000000000000000545454000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000545454000000
+      0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -2134,7 +2140,7 @@ object EditForm: TEditForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000054545400000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000600000000000000000000000000000000000000054545400000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -2142,15 +2148,6 @@ object EditForm: TEditForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000005454540000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000006000000000000000000000005454540000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000006000000060000000600000006000
-      0000600000006000000060000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -2158,15 +2155,25 @@ object EditForm: TEditForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000006000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000005C5C5C00000000005C5C5C0000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000005C5C5C0000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000600000000000000000000000000000000000000000000000000000000000
+      000000000000000000005C5C5C00000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000005C5C5C00000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000005C5C5C0000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -2180,42 +2187,39 @@ object EditForm: TEditForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000FFFFFF000000
-      0000000000000000000000000000000000000000000060000000000000006000
-      0000000000006000000060000000600000000000000060000000000000000000
-      0000600000006000000060000000000000000000000000000000FFFFFF000000
       00000000000000000000000000000000000000000000FFFFFF00000000000000
       000000000000FFFFFF0000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000002424
       2400242424002424240000000000000000000000000000000000242424002424
       2400242424000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000060000000000000006000
+      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000006000000000000000600000000000000060000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
-      0000600000000000000060000000000000000000000000000000FFFFFF000000
+      0000000000000000000000000000000000000000000000000000FFFFFF000000
       00000000000000000000000000000000000000000000FFFFFF00000000000000
       000000000000FFFFFF0000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000002424
       2400000000002424240000000000000000000000000000000000242424000000
       0000242424000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000060000000600000006000
+      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000006000000000000000600000000000000060000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
-      0000600000000000000060000000000000000000000000000000FFFFFF000000
+      0000000000000000000000000000000000000000000000000000FFFFFF000000
       0000000000000000000000000000000000000000000000000000FFFFFF000000
       0000FFFFFF000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000002424
       2400000000002424240000000000000000000000000000000000242424000000
       0000242424000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000060000000000000006000
+      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000006000000000000000600000000000000060000000000000000000
+      0000000000000000000040606000000000004060600000000000000000000000
-      0000600000000000000060000000000000000000000000000000FFFFFF00FFFF
+      0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
       FF00FFFFFF00000000000000000000000000000000000000000000000000FFFF
       FF00000000000000000000000000000000000000000000000000000000000000
       0000000000000000000024242400000000000000000000000000000000002424
       2400000000002424240000000000000000000000000000000000242424000000
       0000242424000000000000000000000000000000000024242400000000000000
-      0000000000000000000000000000000000000000000000000000600000006000
+      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000006000000000000000000000006000000060000000600000000000
+      0000000000000000000000000000000000000000000000000000000000000000
-      0000600000006000000060000000000000000000000000000000FFFFFF000000
+      0000000000000000000000000000000000000000000000000000FFFFFF000000
       0000000000000000000000000000000000000000000000000000FFFFFF000000
       0000FFFFFF000000000000000000000000000000000000000000000000000000
       0000000000002424240024242400000000000000000000000000000000002424
@@ -2237,9 +2241,9 @@ object EditForm: TEditForm
       2400242424000000000024242400000000000000000000000000000000002424
       2400000000002424240000000000000000000000000000000000242424000000
       0000242424000000000000000000000000000000000024242400000000002424
-      24002424240000000000000000000000000000000000000000005C5C5C000000
+      2400242424000000000000000000000000000000000000000000406060000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00005C5C5C000000000000000000000000000000000000000000000000000000
+      0000406060000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000242424002424
       2400000000000000000024242400242424002424240024242400242424002424
@@ -2253,9 +2257,9 @@ object EditForm: TEditForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000002424240000000000000000000000000000000000242424000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000024242400242424000000000000000000000000005C5C5C000000
+      0000000000002424240024242400000000000000000000000000406060000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00005C5C5C000000000000000000000000000000000000000000000000000000
+      0000406060000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000242424002424
       2400000000000000000024242400242424002424240024242400242424002424
@@ -2286,7 +2290,7 @@ object EditForm: TEditForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000024242400242424000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000005C5C5C00000000005C5C5C0000000000000000000000
+      0000000000000000000040606000000000004060600000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000FFFFFF00C0C0C000C0C0C000FFFFFF00000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -2821,19 +2825,19 @@ object EditForm: TEditForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000FFF7FFFF00000000FEF7FEFF00000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      FFF7FFFF00000000FEF7FEFF00000000FFD5FFFF00000000FEE3FEFB00000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      FFF7FFFD00000000AA02AA0000000000FEE7FEE500000000FECFFECB00000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      F69FFE9F00000000FA3FFE3F00000000007FFE7F00000000FAFFFABF00000000
-      00000000000000000000000000000000FFFFFFFFFEFFFFF7AAABFEFFFEFFFEF7
+      F7FFFC7F00000000FEFFFEFF00000000FFFFFFFFFFFFFEFF8EE3AAABFEFFFEFF
-      FFFDFFFFFEFFFFF7BFFFFEFFFABFFEF7FFFDFFFFFC7FFFD5B80FFEFFEEFFFEE3
+      3C79FFFDFFFFFEFF783DBFFFFEFFFABF7EFDFFFDFFFFFC7FFEFFB80FFEFFEEFF
-      FB9DFFFFF47FFFF7BB3FAA020002AA02FA7DFEE7F467FEE7B8FFFECFEECFFECF
+      DEF7FB9DFFFFF47F9EF3BB3FAA0200020001FA7DFEE7F4679EF3B8FFFECFEECF
-      F9FDFE9FFE9FF69FBBFFFE3FFE3FFA3FFFFDFE7FFE7F007FBFFFFEFFFEFFFAFF
+      DEF7F9FDFE9FFE9FFEFFBBFFFE3FFE3F7EFDFFFDFE7FFE7F783DBFFFFEFFFEFF
-      D555FFFFFFFFF7FFFFFFFEFFFEFFFEFF8F11FFFFFFFFA8B18F11FFE3C7FFAAB5
+      3C79D555FFFFFFFF8EE3FFFFFEFFFEFF8F11FFFFFFFFFFFF8F11FFE3C7FF0EE1
-      8F11FFE3C7FF8AB58383FFE3C7FFAAB583C7FDE3C7BFCB118383F9E3C79FFFFF
+      8F11FFE3C7FF7C7D8383FFE3C7FF783D83C7FDE3C7BF7EFD8383F9E3C79FFEFF
       8111F1E3C78FDEF78111E1E3C7879EF38111C003C0030001FFFF8003C0019EF3
-      FC3FC003C003DEF7F00FE1FFFF87FEFFE007F1FFFF8FFEFFE007F9FFFF9FF83F
+      FC3FC003C003DEF7F00FE1FFFF87FEFFE007F1FFFF8F7EFDE007F9FFFF9F783D
-      F00FFDFFFFBFFC7FFC3FFFFFFFFFFEFFFF7FFFFFFFFF8F11FF7FFFFFFDBF8F11
+      F00FFDFFFFBF7C7DFC3FFFFFFFFF0EE1FF7FFFFFFFFF8F11FF7FFFFFFDBF8F11
       FF7FFFFFEFF78F11E00FF3E77DBE8383E007E1E7F7EF83C7FF63C0E7DC3B8383
       FF73F3E7700E8111FF73F3E7E0078111FB730000E0078111F363F3E7700EFFFF
       E007F3E7DC3BFE7FE00FF1C7F7EFFE7FF37FF80F7DBEF81FFB7FFC1FEFF7F81F
@@ -2860,18 +2864,8 @@ object EditForm: TEditForm
     object mnuReset: TMenuItem
       Caption = 'Reset triangle'
       Hint = 'Reset triangle'
-      ImageIndex = 21
-      OnClick = mnuResetClick
-    end
-    object mnuResetTrgPosition: TMenuItem
-      Caption = 'Reset position'
       ImageIndex = 22
-      OnClick = btnOcoefsClick
+      OnClick = mnuResetClick
-    end
-    object mnuResetTrgRotation: TMenuItem
-      Caption = 'Reset rotation'
-      ImageIndex = 23
-      OnClick = mnuResetTrgRotationClick
     end
     object N6: TMenuItem
       Caption = '-'
@@ -2919,5 +2913,23 @@ object EditForm: TEditForm
       ImageIndex = 11
       OnClick = mnuFlipVerticalClick
     end
+    object N7: TMenuItem
+      Caption = '-'
+    end
+    object mnuResetTrgPosition: TMenuItem
+      Caption = 'Reset position'
+      ImageIndex = 23
+      OnClick = btnOcoefsClick
+    end
+    object mnuResetTrgRotation: TMenuItem
+      Caption = 'Reset rotation'
+      ImageIndex = 24
+      OnClick = mnuResetTrgRotationClick
+    end
+    object mnuResetTrgScale: TMenuItem
+      Caption = 'Reset scale'
+      ImageIndex = 25
+      OnClick = mnuResetTrgScaleClick
+    end
   end
 end

2.10/Source/Editor.pas

@@ -177,6 +177,8 @@ type
     tbAutoEditMode: TToolButton;
     mnuResetTrgRotation: TMenuItem;
     mnuResetTrgPosition: TMenuItem;
+    mnuResetTrgScale: TMenuItem;
+    N7: TMenuItem;
     procedure ValidateVariable;
     procedure vleVariablesValidate(Sender: TObject; ACol, ARow: Integer; const KeyName, KeyValue: string);
     procedure vleVariablesKeyPress(Sender: TObject; var Key: Char);
@@ -192,7 +194,7 @@ type
       Shift: TShiftState; X, Y: integer);
     procedure TriangleViewMouseWheel(Sender: TObject; Shift: TShiftState;
       WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
-//    procedure TriangleViewDblClick(Sender: TObject);
+    procedure TriangleViewDblClick(Sender: TObject);
     procedure TriangleViewKeyDown(Sender: TObject; var Key: Word;
       Shift: TShiftState);
     procedure TriangleViewKeyUp(Sender: TObject; var Key: Word;
@@ -314,6 +316,9 @@ type
       Shift: TShiftState; X, Y: Integer);
     procedure DragPanelDblClick(Sender: TObject);
     procedure mnuResetTrgRotationClick(Sender: TObject);
+    procedure mnuResetTrgScaleClick(Sender: TObject);
+    procedure ResetEdgeRotation(n: integer);
+    procedure ResetEdgeScale(n: integer);
 
   private
     TriangleView: TCustomDrawControl;
@@ -328,9 +333,12 @@ type
     updating: boolean;
 
     MousePos: TPoint; // in screen coordinates
-    mouseOverTriangle, mouseOverEdge, mouseOverCorner: integer;
+    mouseOverTriangle, mouseOverEdge, mouseOverCorner, mouseOverWidget: integer;
     mouseOverPos: TSPoint;
 
+    Widgets: array[0..3] of array [0..2] of TSPoint;
+    xx, xy, yx, yy: double;
+
     varDragMode: boolean;
     varDragIndex: integer;
     varDragValue: double;
@@ -341,9 +349,10 @@ type
 
     // --Z-- variables moved from outside
     GraphZoom: double;
-    TriangleCaught, CornerCaught: boolean;
+    TriangleCaught, CornerCaught, EdgeCaught: boolean;
     LocalAxisLocked: boolean;
 //    SelectedTriangle: integer; // outside only for scripting (??)
+    oldSelected: integer;
     SelectedCorner: integer;
     SelectMode: boolean;
     HasChanged: boolean;
@@ -365,6 +374,7 @@ type
 *)
     procedure UpdateFlameX;
     procedure UpdateFlame(DrawMain: boolean);
+    procedure UpdateWidgets;
     procedure DeleteTriangle(t: integer);
 
     function GetPivot: TSPoint; overload;
@@ -396,6 +406,7 @@ const
   TrgColors: array[-1..13] of TColor = (clGray,
     $0000ff, $00ffff, $00ff00, $ffff00, $ff0000, $ff00ff, $007fff,
     $7f00ff, $55ffff, $ccffcc, $ffffaa, $ff7f7f, $ffaaff, $55ccff );
+
 var
   EditForm: TEditForm;
 //  pcenterx, pcentery, pscale: double;
@@ -637,6 +648,7 @@ begin
   varDragMode := false;
   pnlDragMode := false;
   CornerCaught := false;
+  EdgeCaught := false;
   TriangleCaught := false;
 
   ShowSelectedInfo;
@@ -821,7 +833,7 @@ begin
   if not chkPreserve.checked then cp.ComputeWeights(MainTriangles, Transforms);
   DrawPreview;
   ShowSelectedInfo;
-  TriangleView.Refresh;;
+  TriangleView.Refresh;
 end;
 
 procedure TEditForm.UpdateFlame(DrawMain: boolean);
@@ -848,6 +860,39 @@ begin
   end;
 end;
 
+procedure TEditForm.UpdateWidgets;
+  function Point(x, y: double): TSPoint;
+  begin
+    Result.x := x;
+    Result.y := y;
+  end;
+//var
+//  xx, xy, yx, yy: double;
+begin
+  with mainTriangles[Selectedtriangle] do
+  begin
+    xx := x[0] - x[1];
+    xy := y[0] - y[1];
+    yx := x[2] - x[1];
+    yy := y[2] - y[1];
+    Widgets[0][0] := Point(x[1] + 0.8*xx + yx, y[1] + 0.8*xy + yy);
+    Widgets[0][1] := Point(x[1] + xx + yx,     y[1] + xy + yy);
+    Widgets[0][2] := Point(x[1] + xx + 0.8*yx, y[1] + xy + 0.8*yy);
+
+    Widgets[1][0] := Point(x[1] - 0.8*xx + yx, y[1] - 0.8*xy + yy);
+    Widgets[1][1] := Point(x[1] - xx + yx,     y[1] - xy + yy);
+    Widgets[1][2] := Point(x[1] - xx + 0.8*yx, y[1] - xy + 0.8*yy);
+
+    Widgets[2][0] := Point(x[1] - 0.8*xx - yx, y[1] - 0.8*xy - yy);
+    Widgets[2][1] := Point(x[1] - xx - yx,     y[1] - xy - yy);
+    Widgets[2][2] := Point(x[1] - xx - 0.8*yx, y[1] - xy - 0.8*yy);
+
+    Widgets[3][0] := Point(x[1] + 0.8*xx - yx, y[1] + 0.8*xy - yy);
+    Widgets[3][1] := Point(x[1] + xx - yx,     y[1] + xy - yy);
+    Widgets[3][2] := Point(x[1] + xx - 0.8*yx, y[1] + xy - 0.8*yy);
+  end;
+end;
+
 procedure TEditForm.DeleteTriangle(t: integer);
 var
   i: integer;
@@ -863,7 +908,7 @@ begin
     assert(cp.HasFinalXForm = false);
     MainTriangles[Transforms] := MainTriangles[-1];
     tbEnableFinalXform.Down := false;
-    if (SelectedTriangle = Transforms ) then Dec(SelectedTriangle);
+    if (SelectedTriangle = Transforms) then Dec(SelectedTriangle);
   end
   else
   if (Transforms <= 2) then exit
@@ -974,7 +1019,26 @@ var
   end;
 
 var
-  xx, xy, yx, yy: double;
+  a, b, c: TPoint;
+
+  procedure DrawWidgets;
+  var
+    i, j, n: integer;
+  begin
+    with Bitmap.Canvas do
+      with MainTriangles[SelectedTriangle] do
+      begin
+        for i := 0 to 3 do
+        begin
+          a:=toscreen(Widgets[i][0].x, Widgets[i][0].y);
+          b:=toscreen(Widgets[i][1].x, Widgets[i][1].y);
+          c:=toscreen(Widgets[i][2].x, Widgets[i][2].y);
+          moveto(a.x, a.y);
+          lineto(b.x, b.y);
+          lineto(c.x, c.y);
+        end
+      end;
+  end;
 
 var
   i, n, tc, tn: integer;
@@ -982,7 +1046,6 @@ var
   tx, ty: double;
 
   ax, ay: integer;
-  a, b, c: TPoint;
 
   gridX1, gridX2, gridY1, gridY2, gi, gstep: double;
   gp: TRoundToRange;
@@ -1127,39 +1190,21 @@ end;
         TextOut(b.x+2, b.y+1, 'O');
       end;
 
-      //if showTriangleCorners then
+      UpdateWidgets;
-      with MainTriangles[SelectedTriangle] do
+      if AutoEditMode then begin
-      begin
+        n := GetTriangleColor(SelectedTriangle);// shr 1 and $7f7f7f;
-        xx := x[0] - x[1];
+        if mouseOverTriangle <> SelectedTriangle then n := n shr 1 and $7f7f7f;
-        xy := y[0] - y[1];
+        Pen.Color := n;
-        yx := x[2] - x[1];
-        yy := y[2] - y[1];
-        Pen.Color := GetTriangleColor(SelectedTriangle) shr 1 and $7f7f7f;
         Pen.Mode := pmMerge;
-        a:=toscreen(x[1] + 0.8*xx + yx, y[1] + 0.8*xy + yy);
+        DrawWidgets;
-        b:=toscreen(x[1] + xx + yx,     y[1] + xy + yy);
+
-        c:=toscreen(x[1] + xx + 0.8*yx, y[1] + xy + 0.8*yy);
+        if mouseOverWidget >= 0 then
-        moveto(a.x, a.y);
+        begin
-        lineto(b.x, b.y);
+          pen.Color := pen.Color shr 1 and $7f7f7f;
-        lineto(c.x, c.y);
+          pen.Width := 4;
-        a:=toscreen(x[1] - 0.8*xx + yx, y[1] - 0.8*xy + yy);
+          DrawWidgets;
-        b:=toscreen(x[1] - xx + yx,     y[1] - xy + yy);
+          pen.Width := 1;
-        c:=toscreen(x[1] - xx + 0.8*yx, y[1] - xy + 0.8*yy);
+        end;
-        moveto(a.x, a.y);
-        lineto(b.x, b.y);
-        lineto(c.x, c.y);
-        a:=toscreen(x[1] - 0.8*xx - yx, y[1] - 0.8*xy - yy);
-        b:=toscreen(x[1] - xx - yx,     y[1] - xy - yy);
-        c:=toscreen(x[1] - xx - 0.8*yx, y[1] - xy - 0.8*yy);
-        moveto(a.x, a.y);
-        lineto(b.x, b.y);
-        lineto(c.x, c.y);
-        a:=toscreen(x[1] + 0.8*xx - yx, y[1] + 0.8*xy - yy);
-        b:=toscreen(x[1] + xx - yx,     y[1] + xy - yy);
-        c:=toscreen(x[1] + xx - 0.8*yx, y[1] + xy - 0.8*yy);
-        moveto(a.x, a.y);
-        lineto(b.x, b.y);
-        lineto(c.x, c.y);
       end;
 
       if showVarPreview then
@@ -1216,8 +1261,10 @@ end;
               d1 := dist(Pivot.x, Pivot.y, MainTriangles[SelectedTriangle].x[i], MainTriangles[SelectedTriangle].y[i]);
               if d1 > d then
               begin
+                if d > 0 then begin
                   dx := dx/d*d1;
                   dy := dy/d*d1;
+                end;
                 d := d1;
               end;
             end;
@@ -1363,6 +1410,9 @@ end;
             end;
           end;
         end;
+      end;
+
+//      if EdgeCaught then
         if (mouseOverEdge >= 0) then // highlight edge under cursor
         begin
           i := (mouseOverEdge + 1) mod 3;
@@ -1378,7 +1428,6 @@ end;
           pen.Mode:=pmCopy;
           pen.Width:=1;
         end;
-      end;
 
       // draw pivot point
       a := ToScreen(GetPivot.x, GetPivot.y);
@@ -1438,7 +1487,7 @@ begin
 
   TriangleView.OnPaint := TriangleViewPaint;
 
-  TriangleView.OnDblClick   := mnuAutoZoomClick;
+  TriangleView.OnDblClick   := TriangleViewDblClick;
   TriangleView.OnMouseDown  := TriangleViewMouseDown;
   TriangleView.OnMouseMove  := TriangleViewMouseMove;
   TriangleView.OnMouseUp    := TriangleViewMouseUp;
@@ -1449,7 +1498,6 @@ begin
   TriangleView.OnEnter      := TriangleViewInvalidate;
   TriangleView.OnExit       := TriangleViewExit;
   TriangleView.OnMouseLeave := TriangleViewmouseLeave;
-//
 
   for i:= 0 to NRVAR - 1 do begin
     VEVars.InsertRow(Varnames(i), '0', True);
@@ -1481,11 +1529,14 @@ begin
   SelectMode := true;
   editMode := modeMove;
 
-  CornerCaught := False;
+  EdgeCaught := false;
-  TriangleCaught := False;
+  CornerCaught := false;
+  TriangleCaught := false;
   mouseOverTriangle := -1;
   mouseOverCorner := -1;
   mouseOverEdge := -1;
+  mouseOverWidget := -1;
+  oldSelected := -1;
 
   for i := 0 to NRVAR-1 do
     VarsCache[i] := MinDouble;
@@ -1502,6 +1553,8 @@ var
   d: double;
 
   i0, i1: integer;
+
+  dx, dy, x1, y1: double;
 label FoundCorner, Skip1, Skip2;
 begin
   Scale(fx, fy, x, y);
@@ -1523,6 +1576,12 @@ begin
 
   if not (CornerCaught or TriangleCaught) then // look for a point under cursor
   begin
+    mouseOverWidget := -1;
+    mouseOverEdge := -1;
+    mouseOverCorner:= -1;
+    mouseOverPos.x := fx;
+    mouseOverPos.y := fy;
+
     if SelectMode then
     begin
       i0:=0;
@@ -1542,7 +1601,7 @@ begin
         begin
           mouseOverTriangle := i;
           mouseOverCorner := j;
-          mouseOverEdge := -1;
+//          mouseOverEdge := -1;
 
 // -- from MouseDown -- for highlighting:
 // TODO: optimize...
@@ -1577,7 +1636,25 @@ begin
       end;
     end;
 
-    if AutoEditMode and (oldMode = modeNone) then
+    if AutoEditMode then //and (oldMode = modeNone) then
+    begin
+      for i := 0 to 3 do // -- detect 'widget' hit
+        for j := 0 to 1 do begin
+          if abs(line_dist(fx, fy, Widgets[i][j].x, Widgets[i][j].y,
+                                   Widgets[i][j+1].x, Widgets[i][j+1].y)
+                 ) * GraphZoom * 50 < 3 then
+          begin
+            mouseOverTriangle := SelectedTriangle;
+            mouseOverWidget := i;
+//            mouseOverEdge := -1;
+//            mouseOverCorner:= -1;
+            mouseOverPos.x := fx;
+            mouseOverPos.y := fy;
+
+            goto FoundCorner;
+          end;
+        end;
+
       for i := i1 downto i0 do
       begin
         for j := 0 to 2 do // -- detect edge hit
@@ -1588,7 +1665,7 @@ begin
           begin
             mouseOverTriangle:=i;
             mouseOverEdge := j;
-          mouseOverCorner:= -1;
+//            mouseOverCorner:= -1;
             mouseOverPos.x := fx;
             mouseOverPos.y := fy;
 
@@ -1596,10 +1673,7 @@ begin
           end;
         end;
       end;
-    mouseOverEdge := -1;
+    end;
-    mouseOverCorner:= -1;
-    mouseOverPos.x := fx;
-    mouseOverPos.y := fy;
 
     i := InsideTriangle(fx, fy);
     if i >= 0 then mouseOverTriangle:=i
@@ -1609,7 +1683,11 @@ FoundCorner:
   end;
 
   if (mouseOverTriangle >= 0) or (SelectMode = false) or (oldMode <> modeNone) then
-    if mouseOverEdge >= 0 then begin // kinda hack, not good...
+  begin
+    if (mouseOverWidget >= 0) and (oldMode = modeNone) then
+      TriangleView.Cursor := crEditRotate
+    else
+    if (mouseOverEdge >= 0) and (oldMode = modeNone) then begin // kinda hack, not good...
       if mouseOverEdge = 2 then
         TriangleView.Cursor := crEditScale
       else
@@ -1626,6 +1704,7 @@ FoundCorner:
       modePick:
         TriangleView.Cursor := crEditArrow;
     end
+  end
   else
     TriangleView.Cursor := crEditArrow; //crDefault;
 
@@ -1836,7 +1915,9 @@ end;
 procedure TEditForm.TriangleViewMouseDown(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; X, Y: integer);
 var
-  d, fx, fy: double;
+  a, d, fx, fy: double;
+  dx, dy, x1, y1: double;
+//  xx, xy, yx, yy: double;
   i, j: integer;
   i0, i1: integer;
 label
@@ -1859,11 +1940,16 @@ begin
       end;
       if PivotMode = pivotLocal then
       with MainTriangles[SelectedTriangle] do begin
-        LocalPivot.x :=
+//        xx := x[0] - x[1];
-          ((fx - x[1]) - (x[2]-x[1])/(y[2]-y[1])*(fy - y[1]))/
+//        xy := y[0] - y[1];
-          ((x[0]-x[1]) - (x[2]-x[1])/(y[2]-y[1])*(y[0]-y[1]));
+//        yx := x[2] - x[1];
-        LocalPivot.y :=
+//        yy := y[2] - y[1];
-          ((fy - y[1]) - (y[0]-y[1])*LocalPivot.x)/(y[2]-y[1]);
+        d := (xx*yy - yx*xy);
+        if d <> 0 then
+        begin
+          LocalPivot.x := ( (fx - x[1]) * yy - (fy - y[1]) * yx) / d;
+          LocalPivot.y := (-(fx - x[1]) * xy + (fy - y[1]) * xx) / d;
+        end
       end
       else begin
         WorldPivot.x := fx;
@@ -1887,6 +1973,7 @@ begin
       i0:=SelectedTriangle;
       i1:=i0;
     end;
+    oldSelected := SelectedTriangle;
 
     for i := i1 downto i0 do
     begin
@@ -1917,10 +2004,9 @@ begin
           OldTriangle := MainTriangles[SelectedTriangle];
           oldx := MainTriangles[SelectedTriangle].x[j] - Pivot.X;
           oldy := MainTriangles[SelectedTriangle].y[j] - Pivot.Y;
-          olddist := sqrt(oldx*oldx + oldy*oldy);
+          olddist := sqrt(sqr(oldx) + sqr(oldy));
 
           HasChanged := false;
-          //MainForm.UpdateUndo;
           ShowSelectedInfo;
           TriangleView.Invalidate;
           exit;
@@ -1928,7 +2014,26 @@ begin
       end;
     end;
 
-    if AutoEditMode and (oldMode = modeNone) then
+    if AutoEditMode then //and (oldMode = modeNone) then
+    begin
+      for i := 0 to 3 do // -- detect 'widget' hit
+        for j := 0 to 1 do
+        begin
+          if abs(line_dist(fx, fy, Widgets[i][j].x, Widgets[i][j].y,
+                                   Widgets[i][j+1].x, Widgets[i][j+1].y)
+                      ) * GraphZoom * 50 < 3 then
+          begin
+//            modeHack := true;
+            if (oldMode = modeNone) then
+            begin
+              modeHack := true;
+              oldMode := editMode;
+              editMode := modeRotate;
+            end;
+            goto FoundTriangle;
+          end;
+        end;
+
       for i := i1 downto i0 do
       begin
         for j := 0 to 2 do // -- detect edge hit
@@ -1938,16 +2043,40 @@ begin
                  ) * GraphZoom * 50 < 3 then
           begin
             SelectedTriangle := i;
+            EdgeCaught := true;
+//            modeHack := true;
+            if (oldMode = modeNone) then
+            begin
               modeHack := true;
               oldMode := editMode;
               if j = 2 then
                 editMode := modeScale
               else
+//                editMode := modeRotate;
+begin
+          // hacky...
+          CornerCaught := True;
           editMode := modeRotate;
+          if j = 1 then SelectedCorner := 2
+          else SelectedCorner := 0;
+          Pivot := GetPivot;
+          LocalAxisLocked := false;
+          OldTriangle := MainTriangles[SelectedTriangle];
+          oldx := MainTriangles[SelectedTriangle].x[SelectedCorner] - Pivot.X;
+          oldy := MainTriangles[SelectedTriangle].y[SelectedCorner] - Pivot.Y;
+          olddist := sqrt(sqr(oldx) + sqr(oldy));
+
+          HasChanged := false;
+          ShowSelectedInfo;
+          TriangleView.Invalidate;
+          exit;
+end;
+            end;
             goto FoundTriangle;
           end;
         end;
       end;
+    end;
 
     // so user hasn't selected any corners,
     // let's check for triangles then!
@@ -2000,15 +2129,16 @@ begin
       modeHack := false;
     end;
 
-    CornerCaught := False;
-    TriangleCaught := False;
     if HasChanged then
     begin
       MainForm.UpdateUndo;
       UpdateFlame(true);
       HasChanged := False;
-    end
+    end;
-    else TriangleView.Invalidate;
+    EdgeCaught := false;
+    CornerCaught := false;
+    TriangleCaught := false;
+    TriangleView.Invalidate;
   end
   else if (Button = mbRight) and viewDragMode then
   begin
@@ -2027,7 +2157,7 @@ begin
     else viewDragged := false;
     Screen.Cursor := crDefault;
     SetCaptureControl(nil);
-    exit;
+    //exit;
   end
 end;
 
@@ -2527,13 +2657,6 @@ begin
   UpdateFlame(True);
 end;
 
-{
-procedure TEditForm.TriangleViewDblClick(Sender: TObject);
-begin
-  AutoZoom;
-end;
-}
-
 procedure TEditForm.cbTransformsChange(Sender: TObject);
 begin
   if SelectedTriangle <> cbTransforms.ItemIndex then SelectedTriangle := cbTransforms.ItemIndex;
@@ -3018,7 +3141,7 @@ end;
 
 function TEditForm.GetPivot(n: integer): TSPoint;
 begin
-  if PivotMode = pivotLocal then
+  if (PivotMode = pivotLocal) or EdgeCaught then // hmm... should be always local for edges
     with MainTriangles[n] do begin
       Result.x := x[1] + (x[0] - x[1])*LocalPivot.x + (x[2] - x[1])*LocalPivot.y;
       Result.y := y[1] + (y[0] - y[1])*LocalPivot.x + (y[2] - y[1])*LocalPivot.y;
@@ -3405,6 +3528,36 @@ begin
   Handled := true;
 end;
 
+procedure TEditForm.TriangleViewDblClick(Sender: TObject);
+begin
+  if mouseOverTriangle >= 0 then
+  begin
+    if mouseOverCorner >= 0 then begin
+      case mouseOverCorner of
+        0: ResetEdgeScale(0); //btnXcoefsClick(Sender);
+        1: btnOcoefsClick(Sender);
+        2: ResetEdgeScale(2); //btnYcoefsClick(Sender);
+      end;
+    end
+    else if mouseOverEdge >= 0 then begin
+      case mouseOverEdge of
+        0: if editMode = modeScale then ResetEdgeScale(0) else ResetEdgeRotation(0);
+        1: if editMode = modeScale then ResetEdgeScale(2) else ResetEdgeRotation(2);
+        2: mnuResetTrgScaleClick(Sender);
+      end;
+    end
+    else if mouseOverWidget >= 0 then begin
+      mnuResetTrgRotationClick(Sender);
+    end
+    else case editMode of
+      //modeMove: Do Nothing
+      modeScale: mnuResetTrgScaleClick(Sender);
+      modeRotate: mnuResetTrgRotationClick(Sender);
+    end;
+  end
+  else AutoZoom;
+end;
+
 procedure TEditForm.TriangleViewInvalidate(Sender: TObject);
 begin
   TriangleView.Invalidate;
@@ -3412,14 +3565,6 @@ end;
 
 procedure TEditForm.tbEditModeClick(Sender: TObject);
 begin
-{
-  if Sender = tbRotate then editMode := modeRotate
-  else if Sender = tbScale then editMode := modeScale
-  else editMode := modeMove;
-  tbMove.Down := (editMode = modeMove);
-  tbRotate.Down := (editMode = modeRotate);
-  tbScale.Down := (editMode = modeScale);
-}
   AutoEditMode := (Sender = tbAutoEditMode);
   if Sender = tbRotate then
   begin
@@ -3436,6 +3581,7 @@ begin
     //tbMove.Down := true;
   end;
   TToolButton(Sender).Down := true;
+  TriangleView.Invalidate;
 end;
 
 procedure TEditForm.tbFullViewClick(Sender: TObject);
@@ -4051,20 +4197,127 @@ end;
 
 procedure TEditForm.mnuResetTrgRotationClick(Sender: TObject);
 var
+//  xx, xy, yx, yy: double;
+  dx, dy: double;
+  ax, ay, da: integer;
+  nx0, ny0, nx2, ny2: double;
+begin
+  with MainTriangles[SelectedTriangle] do
+  begin
+//    xx := x[0] - x[1];
+//    xy := y[0] - y[1];
+//    yx := x[2] - x[1];
+//    yy := y[2] - y[1];
+    ax := round( arctan2(xy, xx) / (pi/2) );
+    ay := round( arctan2(yy, yx) / (pi/2) );
+    dx := Hypot(xx, xy);
+    dy := Hypot(yx, yy);
+    if xx*yy - yx*xy >= 0 then da := 1 else da := -1;
+    if ax = ay then ay := ay + da
+    else if abs(ax-ay) = 2 then ay := ay - da;
+
+    nx0 := x[1] + dx*cos(ax*pi/2);
+    ny0 := y[1] + dx*sin(ax*pi/2);
+    nx2 := x[1] + dy*cos(ay*pi/2);
+    ny2 := y[1] + dy*sin(ay*pi/2);
+    if (x[0] = nx0) and (y[0] = ny0) and (x[2] = nx2) and (y[2] = ny2) then exit;
+    MainForm.UpdateUndo;
+    x[0] := nx0;
+    y[0] := ny0;
+    x[2] := nx2;
+    y[2] := ny2;
+    UpdateFlame(True);
+  end;
+end;
+
+procedure TEditForm.mnuResetTrgScaleClick(Sender: TObject);
+var
+//  xx, xy, yx, yy: double;
+  dx, dy: double;
+  nx0, ny0, nx2, ny2: double;
+begin
+  with MainTriangles[SelectedTriangle] do
+  begin
+//    xx := x[0] - x[1];
+//    xy := y[0] - y[1];
+//    yx := x[2] - x[1];
+//    yy := y[2] - y[1];
+    dx := Hypot(xx, xy);
+    dy := Hypot(yx, yy);
+    if dx <> 0 then begin
+      nx0 := x[1] + (x[0] - x[1])/dx;
+      ny0 := y[1] + (y[0] - y[1])/dx;
+    end
+    else begin
+      nx0 := x[1] + 1;
+      ny0 := y[1];
+    end;
+    if dx <> 0 then begin
+      nx2 := x[1] + (x[2] - x[1])/dy;
+      ny2 := y[1] + (y[2] - y[1])/dy;
+    end
+    else begin
+      nx2 := x[1];
+      ny2 := y[1] + 1;
+    end;
+    if (x[0] = nx0) and (y[0] = ny0) and (x[2] = nx2) and (y[2] = ny2) then exit;
+    MainForm.UpdateUndo;
+    x[0] := nx0;
+    y[0] := ny0;
+    x[2] := nx2;
+    y[2] := ny2;
+    UpdateFlame(True);
+  end;
+end;
+
+procedure TEditForm.ResetEdgeRotation(n: integer);
+var
+  dx, dy, d: double;
+  a: integer;
   nx, ny: double;
 begin
   with MainTriangles[SelectedTriangle] do
   begin
-    nx := x[1] + Hypot(x[0] - x[1], y[0] - y[1]);
+    dx := x[n] - x[1];
-    ny := y[1] + Hypot(x[2] - x[1], y[2] - y[1]);
+    dy := y[n] - y[1];
-
+    a := round( arctan2(dy, dx) / (pi/2) );
-    if (x[0] = nx) and (y[0] = y[1]) and (x[2] = x[1]) and (y[2] = ny) then exit;
+    d := Hypot(dx, dy);
+//    if xx*yy - yx*xy >= 0 then da := 1 else da := -1;
+//    if ax = ay then ay := ay + da
+//    else if abs(ax-ay) = 2 then ay := ay - da;
 
+    nx := x[1] + d*cos(a*pi/2);
+    ny := y[1] + d*sin(a*pi/2);
+    if (x[n] = nx) and (y[n] = ny) then exit;
     MainForm.UpdateUndo;
-    x[0] := nx;
+    x[n] := nx;
-    y[0] := y[1];
+    y[n] := ny;
-    x[2] := x[1];
+    UpdateFlame(True);
-    y[2] := ny;
+  end;
+end;
+
+procedure TEditForm.ResetEdgeScale(n: integer);
+var
+  dx, dy, d: double;
+  nx, ny: double;
+begin
+  with MainTriangles[SelectedTriangle] do
+  begin
+    dx := x[n] - x[1];
+    dy := y[n] - y[1];
+    d := Hypot(dx, dy);
+    if d <> 0 then begin
+      nx := x[1] + dx / d;
+      ny := y[1] + dy / d;
+    end
+    else begin
+      nx := x[1] + ifthen(n=0, 1, 0);
+      ny := y[1] + ifthen(n=2, 1, 0);
+    end;
+    if (x[n] = nx) and (y[n] = ny) then exit;
+    MainForm.UpdateUndo;
+    x[n] := nx;
+    y[n] := ny;
     UpdateFlame(True);
   end;
 end;