DocLoading

app/DD-Record-Organizer/frmNodeNavigation.vb

@@ -979,7 +979,12 @@ Public Class frmNodeNavigation
                     SplitContainerDocView.Collapsed = True
                 Else
                     RibbonPageGroupDocResult.Enabled = True
-                    SplitContainerDocView.Collapsed = Not CONFIG.Config.DocumentViewerShown
+                    If Node_AfterSelect = False Then
+                        SplitContainerDocView.Collapsed = Not CONFIG.Config.DocumentViewerShown
+                    Else
+                        SplitContainerDocView.Collapsed = True
+                    End If
+
                 End If
             End If
 
@@ -2004,6 +2009,13 @@ Public Class frmNodeNavigation
             If FORM_SHOWN = False Then
                 Return 0
             End If
+            If Node_AfterSelect = True Then
+                SplitContainerDocView.Collapsed = True
+                GridViewDoc_Search.ClearSelection()
+                GridViewDoc_Search.FocusedRowHandle = DevExpress.XtraGrid.GridControl.InvalidRowHandle
+
+                Return 0
+            End If
             Update_DocID_Label(False)
             Update_Notification_Label(False, "", "")
             If GridViewDoc_Search.FocusedRowHandle >= 0 Then
@@ -2013,6 +2025,9 @@ Public Class frmNodeNavigation
                     Update_DocID_Label(True, omsg, EditState.Update)
                     If SELECTED_DOC_ID <> oDocID Then
                         SELECTED_DOC_ID = oDocID
+                        If SplitContainerDocView.Collapsed Then
+                            SplitContainerDocView.Collapsed = False
+                        End If
                         DocView_DisplaySelectedDoc(False)
                     End If
                     Update_DocID_Label(True, omsg, EditState.Update)
@@ -2956,7 +2971,8 @@ Public Class frmNodeNavigation
         Dim oDocuments = Current_DocList.SelectedDocuments
         If oDocuments.Count = 1 Then
             ClassFileResult.DocID = oDocuments.First.DocId
-            ClassFileResult.DocumentPath = oDocuments.First.DocPath
+            ClassFileResult.ParentID = oDocuments.First.ParentID
+            ClassFileResult.FileName = oDocuments.First.Filename
             frmWM_CreateVersion.ShowDialog()
             Await RUN_DOCSEARCH(True)
         Else
@@ -3228,6 +3244,9 @@ Public Class frmNodeNavigation
         DocView_DisplaySelectedDoc(False)
     End Sub
     Private Async Sub DocView_DisplaySelectedDoc(AfterNodeChange As Boolean)
+        If AfterNodeChange Then
+            Exit Sub
+        End If
         Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
         Try
             Dim oSelectedDoc = ClassDocGrid.GetSingleSelectedDocument(GridViewDoc_Search)