Closes #1168

Author: dcwhite

src/Interface/Application/SCIRunMainWindow.cc

@@ -356,6 +356,8 @@ SCIRunMainWindow::SCIRunMainWindow() : shortcuts_(0), firstTimePythonShown_(true
 
   hideNonfunctioningWidgets();
 
+  connect(moduleSelectorDockWidget_, SIGNAL(topLevelChanged(bool)), this, SLOT(updateDockWidgetProperties(bool)));
+
   statusBar()->addPermanentWidget(new QLabel("Version: " + QString::fromStdString(VersionInfo::GIT_VERSION_TAG)));
 
 	WidgetStyleMixin::tabStyle(optionsTabWidget_);
@@ -673,6 +675,7 @@ void SCIRunMainWindow::loadRecentNetwork()
 
 void SCIRunMainWindow::closeEvent(QCloseEvent* event)
 {
+  windowState_ = saveState();
   if (okToContinue())
   {
     writeSettings();
@@ -1368,6 +1371,28 @@ void SCIRunMainWindow::adjustModuleDock(int state)
   Preferences::Instance().modulesAreDockable.setValue(dockable);
 }
 
+void SCIRunMainWindow::showEvent(QShowEvent* event)
+{
+  restoreState(windowState_);
+  QMainWindow::showEvent(event);
+}
+
+void SCIRunMainWindow::hideEvent(QHideEvent * event)
+{
+  windowState_ = saveState();
+  QMainWindow::hideEvent(event);
+}
+
+void SCIRunMainWindow::updateDockWidgetProperties(bool isFloating)
+{
+  auto dock = qobject_cast<QDockWidget*>(sender());
+  if (dock && isFloating)
+  {
+    dock->setWindowFlags(Qt::Window);
+    dock->show();
+  }
+}
+
 #ifdef __APPLE__
 static const Qt::Key MetadataShiftKey = Qt::Key_Meta;
 #else

src/Interface/Application/SCIRunMainWindow.h

@@ -90,6 +90,8 @@ public Q_SLOTS:
   virtual void closeEvent(QCloseEvent* event) override;
   virtual void keyPressEvent(QKeyEvent *event) override;
   virtual void keyReleaseEvent(QKeyEvent *event) override;
+  virtual void showEvent(QShowEvent* event) override;
+  virtual void hideEvent(QHideEvent* event) override;
 private:
   static SCIRunMainWindow* instance_;
   SCIRunMainWindow();
@@ -104,7 +106,7 @@ public Q_SLOTS:
   QAction* actionEnterWhatsThisMode_;
   QStringList favoriteModuleNames_;
   QToolButton* executeButton_;
-
+  QByteArray windowState_;
   void postConstructionSignalHookup();
   void executeCommandLineRequests();
   void setTipsAndWhatsThis();
@@ -170,6 +172,7 @@ private Q_SLOTS:
   void makeModulesLargeSize();
   void makeModulesSmallSize();
   void alertForNetworkCycles(int code);
+  void updateDockWidgetProperties(bool isFloating);
   void setDataDirectoryFromGUI();
   void toolkitDownload();
   void addToPathFromGUI();