From 0d1ef2b451239906c23b4aacf6adc6275529f7f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Mon, 16 Jul 2012 07:01:26 +0000
Subject: [PATCH] Fixed bug where multiview layout box has not been updated
 correctly

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@15019 383ad7c9-94d9-4d36-a494-682f7c89f535
---
 Core/Core.cc                     | 21 +----------------
 widgets/coreWidget/CoreWidget.cc | 39 +++++++++++++++++---------------
 2 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/Core/Core.cc b/Core/Core.cc
index adc4549b..bb59584c 100644
--- a/Core/Core.cc
+++ b/Core/Core.cc
@@ -1007,26 +1007,7 @@ void Core::multiViewMode( int _mode ) {
   if ( !OpenFlipper::Options::gui() || !OpenFlipperSettings().value("Core/Gui/glViewer/useMultipleViewers",true).toBool() )
     return;
 
-  switch (_mode)
-  {
-    case 0:
-      coreWidget_->baseLayout_->setMode (QtMultiViewLayout::SingleView);
-      PluginFunctions::setActiveExaminer(0);
-      break;
-    case 1:
-      coreWidget_->baseLayout_->setMode (QtMultiViewLayout::DoubleView);
-      break;
-    case 2:
-      coreWidget_->baseLayout_->setMode (QtMultiViewLayout::Grid);
-      break;
-    case 3:
-      coreWidget_->baseLayout_->setMode (QtMultiViewLayout::HSplit);
-      break;
-
-    default:
-      emit log(LOGERR,tr("Requested illegal multiview mode!"));
-      break;
-  }
+  coreWidget_->setViewerLayout(_mode);
 
 }
 
diff --git a/widgets/coreWidget/CoreWidget.cc b/widgets/coreWidget/CoreWidget.cc
index 1b2c27e9..f98f9559 100644
--- a/widgets/coreWidget/CoreWidget.cc
+++ b/widgets/coreWidget/CoreWidget.cc
@@ -940,27 +940,30 @@ CoreWidget::setViewerLayout(int _idx) {
 
   if ( OpenFlipperSettings().value("Core/Gui/glViewer/useMultipleViewers",true).toBool() ) {
 
-  switch (_idx) {
-    case 0:
-      baseLayout_->setPrimary (PluginFunctions::activeExaminer ());
-      baseLayout_->setMode(QtMultiViewLayout::SingleView);
-      break;
-    case 1:
-      baseLayout_->setPrimary (PluginFunctions::activeExaminer ());
-      baseLayout_->setMode(QtMultiViewLayout::DoubleView);
-      break;
-    case 2:
-      baseLayout_->setPrimary (PluginFunctions::activeExaminer ());
-      baseLayout_->setMode(QtMultiViewLayout::Grid);
-      break;
-    case 3:
-      baseLayout_->setPrimary (PluginFunctions::activeExaminer ());
-      baseLayout_->setMode(QtMultiViewLayout::HSplit);
-      break;
-  }
+    switch (_idx) {
+      case 0:
+        baseLayout_->setPrimary (PluginFunctions::activeExaminer ());
+        baseLayout_->setMode(QtMultiViewLayout::SingleView);
+        break;
+      case 1:
+        baseLayout_->setPrimary (PluginFunctions::activeExaminer ());
+        baseLayout_->setMode(QtMultiViewLayout::DoubleView);
+        break;
+      case 2:
+        baseLayout_->setPrimary (PluginFunctions::activeExaminer ());
+        baseLayout_->setMode(QtMultiViewLayout::Grid);
+        break;
+      case 3:
+        baseLayout_->setPrimary (PluginFunctions::activeExaminer ());
+        baseLayout_->setMode(QtMultiViewLayout::HSplit);
+        break;
+      default:
+        emit log(LOGERR,tr("Requested illegal multiview mode!"));
+    }
 
     viewerLayoutBox_->setCurrentIndex(_idx);
   }
+
 }
 
 void
-- 
GitLab