Dock system selection improvements and fixes (#14305)

* Make sure we don't trigger another select when a view in the project tree is selected.
* Fix for #14255 and related issues
* Make sure we can close and open a main window, keeping the layout when reopened.

ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp

@@ -57,6 +57,7 @@
 #include "RiuMessagePanel.h"
 #include "RiuMultiPlotBook.h"
 #include "RiuMultiPlotPage.h"
+#include "RiuPlotMainWindowTools.h"
 #include "RiuToolTipMenu.h"
 #include "RiuTools.h"
 #include "RiuTreeViewEventFilter.h"
@@ -275,8 +276,15 @@ void RiuPlotMainWindow::closeEvent( QCloseEvent* event )
             return;
         }
     }
-    saveWinGeoAndDockToolBarLayout();
-    QMainWindow::closeEvent( event );
+
+    RiuPlotMainWindowTools::remove3dViewsFromDocking();
+
+    if ( auto proj = RimProject::current() )
+    {
+        proj->plotWindowDockState = dockWidgetStateString();
+    }
+
+    RiuMainWindowBase::closeEvent( event );
 }
 
 //--------------------------------------------------------------------------------------------------