Merge branch 'master' of /home/dsarrut/clitk3.server

[clitk.git] / vv / vvMainWindow.cxx

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index 21074a8ea71f4c58a6980411349f9ca1e4f78e13..303efebbaf8aafe2e41f76201f5eab18972c50cb 100644 (file)
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@ -1241,23 +1241,18 @@ void vvMainWindow::ShowHelpDialog()
 //------------------------------------------------------------------------------
 void vvMainWindow::ChangeViewMode()
 {
-  QListIterator<int> it0(splitter_3->sizes());
-  QListIterator<int> it1(splitter_3->sizes());
-  int max0 = 0;
-  int max1 = 1;
-  while (it0.hasNext()) {
-    max0 += it0.next();
-  }
-  while (it1.hasNext()) {
-    max1 += it1.next();
+  QListIterator<int> it(splitter_3->sizes());
+  int max_size = 0;
+  while (it.hasNext()) {
+    max_size += it.next();
   }
   QList<int> size0;
   QList<int> size1;
   if (viewMode == 1) {
     viewMode = 0;
-    size0.push_back(max0);
+    size0.push_back(max_size);
     size0.push_back(0);
-    size1.push_back(max1);
+    size1.push_back(max_size + 1);
     size1.push_back(0);
     splitter_3->setSizes(size0);
     OSplitter->setSizes(size1);
@@ -1266,10 +1261,10 @@ void vvMainWindow::ChangeViewMode()
     DataTree->setColumnHidden(4,1);
   } else {
     viewMode = 1;
-    size0.push_back(int(max0/2));
-    size0.push_back(int(max0/2));
-    size1.push_back(int(max1/2));
-    size1.push_back(int(max1/2));
+    size0.push_back(max_size / 2);
+    size0.push_back(max_size / 2);
+    size1.push_back((max_size + 1) / 2);
+    size1.push_back((max_size + 1) / 2);
     splitter_3->setSizes(size0);
     OSplitter->setSizes(size1);
     DataTree->setColumnHidden(2,0);