jj 01.06

app/DD-Record-Organiser/ClassControlCommandsUI.vb

@@ -27,12 +27,15 @@ Public Class ClassControlCommandsUI
 
     Sub LoadControls(FormId As Integer)
         _CtrlBuilder.ClearControls()
+        _CtrlBuilder.MasterPanel.SuspendLayout()
+
+        Dim sw As New SW("LoadControls")
        
         Dim SQL As String = String.Format("SELECT T.*, dbo.FNPMO_GET_CONTROL_CAPTION ('{2}', {3},T.CONTROL_ID) AS 'CAPTION' FROM VWPMO_CONTROL_SCREEN T WHERE SCREEN_ID = {0} AND FORM_ID = {1}", CURRENT_SCREEN_ID, FormId, USER_LANGUAGE, CURRENT_SCREEN_ID)
 
         ' "SELECT * FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = " & FormId & " and SCREEN_ID = 1"
         Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL)
-        _CtrlBuilder.MasterPanel.SuspendLayout()
+
         For Each dr As DataRow In DT.Rows
             Dim parent As GroupBox = Nothing
             If (dr.Item("CONTROL_PARENT_ID") <> 0) Then
@@ -283,7 +286,6 @@ Public Class ClassControlCommandsUI
                     control = "DataGridViewCheckable - " & dr.Item("CONTROL_ID")
             End Select
            
-            _CtrlBuilder.MasterPanel.ResumeLayout()
 
             ' ContextMenuStrip zuweisen
             ' MasterDataID im ContextMenuStrip Speichern
@@ -293,6 +295,10 @@ Public Class ClassControlCommandsUI
                 '_CtrlBuilder.CurrentControl.Tag = dr.Item("CTRLSCR_MASTER_DATA_ID")
             End If
         Next
+
+        sw.Done()
+
+        _CtrlBuilder.MasterPanel.ResumeLayout()
         
     End Sub