#3271

- Handle tabbed dock widgets while switching between perspectives. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25503 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 11, 2015 · 6385b63 · 6385b63
1 parent 2aabc0e
commit 6385b63
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/OMEdit/OMEditGUI/MainWindow.cpp b/OMEdit/OMEditGUI/MainWindow.cpp
@@ -2419,6 +2419,11 @@ void MainWindow::switchToModelingPerspective()
   mpModelWidgetContainer->currentModelWidgetChanged(mpModelWidgetContainer->getCurrentMdiSubWindow());
   mpVariablesDockWidget->hide();
   mpPlotToolBar->setEnabled(false);
+  // In case user has tabbed the dock widgets then make LibraryTreeWidget active.
+  QList<QDockWidget*> tabifiedDockWidgetsList = tabifiedDockWidgets(mpLibraryTreeDockWidget);
+  if (tabifiedDockWidgetsList.size() > 0) {
+    tabifyDockWidget(tabifiedDockWidgetsList.at(0), mpLibraryTreeDockWidget);
+  }
 }
 
 void MainWindow::switchToPlottingPerspective()
@@ -2443,6 +2448,11 @@ void MainWindow::switchToPlottingPerspective()
   }
   mpVariablesDockWidget->show();
   mpPlotToolBar->setEnabled(true);
+  // In case user has tabbed the dock widgets then make VariablesWidget active.
+  QList<QDockWidget*> tabifiedDockWidgetsList = tabifiedDockWidgets(mpVariablesDockWidget);
+  if (tabifiedDockWidgetsList.size() > 0) {
+    tabifyDockWidget(tabifiedDockWidgetsList.at(0), mpVariablesDockWidget);
+  }
 }
 
 /*!