From 1caed3d7206b8aa4dc03bbdb388299517d77e808 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Tue, 6 Apr 2021 13:21:19 +0200
Subject: [PATCH] ZooFLow: fix active column?

---
 GUIs.ZooFlow/Administration/frmAdmin_Start.vb | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb
index b4eb069d..44fd4d18 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb
@@ -194,7 +194,7 @@ Public Class frmAdmin_Start
         End Try
     End Sub
 
-    Private Function Get_ActiveColumn() As GridColumn
+    Private Sub Style_ActiveColumn(ActiveColumn)
         Dim oActiveEditor As New RepositoryItemImageComboBox With {
             .SmallImages = ActiveImages,
             .GlyphAlignment = HorzAlignment.Center
@@ -204,35 +204,36 @@ Public Class frmAdmin_Start
             New ImageComboBoxItem("Active", True, 0),
             New ImageComboBoxItem("Inactive", False, 1)
         })
-        Dim oActiveColumn = New GridColumn() With {
-            .Name = "columnActive",
-            .Caption = " ",
-            .FieldName = COLUMN_NAME_ACTIVE,
-            .Visible = True,
-            .VisibleIndex = 0,
-            .ColumnEdit = oActiveEditor,
-            .MaxWidth = 30,
-            .MinWidth = 30,
-            .Image = ActiveImages.GetImage(0)
-        }
-        oActiveColumn.OptionsColumn.AllowEdit = False
 
-        Return oActiveColumn
-    End Function
+        With ActiveColumn
+            .Caption = " "
+            .Name = "columnActive"
+            .Visible = True
+            .VisibleIndex = 0
+            .ColumnEdit = oActiveEditor
+            .MaxWidth = 30
+            .MinWidth = 30
+            .Image = ActiveImages.GetImage(0)
+            .OptionsColumn.AllowEdit = False
+        End With
+    End Sub
 
     Private Sub Load_Tree(Source As AdminItem)
         If Source Is Nothing OrElse Source.SQLResult Is Nothing Then
             Exit Sub
         End If
 
-        Dim oActiveColumn = Get_ActiveColumn()
-
         GridControl1.DataSource = Source.SQLResult
         GridControl1.ForceInitialize()
         GridView1.PopulateColumns()
 
+
         If GridView1.Columns.Item(COLUMN_NAME_ACTIVE) Is Nothing Then
+            Dim oActiveColumn = New GridColumn() With {.FieldName = COLUMN_NAME_ACTIVE}
             GridView1.Columns.Add(oActiveColumn)
+            Style_ActiveColumn(oActiveColumn)
+        Else
+            Style_ActiveColumn(GridView1.Columns.Item(COLUMN_NAME_ACTIVE))
         End If
 
         With GridView1.Appearance.EvenRow