Zooflow: Search tweaks

GUIs.ZooFlow/Search/frmFlowSearch2/TokenEditEx.vb

@@ -36,21 +36,31 @@ End Class
 Public Class TokenEditViewInfoEx
     Inherits TokenEditViewInfo
 
+    Const InnerMargin = 3
+
     Public Sub New(item As RepositoryItem)
         MyBase.New(item)
     End Sub
 
     Protected Overrides ReadOnly Property IndentBetweenItems As Integer
         Get
-            Return 10
+            Return InnerMargin
         End Get
     End Property
 
-    Protected Overrides Function CalcItemSizeCore(token As TokenEditToken) As Size
-        Dim oSize = MyBase.CalcItemSizeCore(token)
-        oSize.Width += 15
-        Return oSize
-    End Function
+    Protected Overrides ReadOnly Property ContentRectMargin As Integer
+        Get
+            Return InnerMargin
+        End Get
+    End Property
+
+    Protected Overrides ReadOnly Property IndentBetweenRows As Integer
+        Get
+            Return InnerMargin
+        End Get
+    End Property
+
+
 End Class
 
 
@@ -62,9 +72,7 @@ Public Class TokenEditEx
         RepositoryItemTokenEditEx.RegisterTokenEditEx()
     End Sub
 
-    Public Sub New()
 
-    End Sub
 
     Public Overrides ReadOnly Property EditorTypeName() As String
         Get