E5Gui/E5SideBar.py

changeset 1440
268366c65cbb
parent 1428
6fdd3432654f
child 1447
715bfc0c02db
--- a/E5Gui/E5SideBar.py	Sat Nov 12 13:46:44 2011 +0100
+++ b/E5Gui/E5SideBar.py	Sun Nov 13 13:59:04 2011 +0100
@@ -141,8 +141,6 @@
             self.setMinimumWidth(minSize)
             self.setMaximumWidth(self.__maxSize)
         if self.splitter:
-            index = self.splitter.indexOf(self)
-            self.splitterSizes[index] = max(self.splitterSizes[index], minSize+10)
             self.splitter.setSizes(self.splitterSizes)
     
     def isMinimized(self):
@@ -511,8 +509,10 @@
         
         if self.__orientation in [E5SideBar.North, E5SideBar.South]:
             minSize = self.layout.minimumSize().height()
+            maxSize = self.maximumHeight()
         else:
             minSize = self.layout.minimumSize().width()
+            maxSize = self.maximumWidth()
         
         data = QByteArray(state)
         stream = QDataStream(data, QIODevice.ReadOnly)
@@ -524,14 +524,11 @@
         
         stream >> self.__bigSize
         self.__minSize = max(stream.readUInt16(), minSize)
-        self.__maxSize = stream.readUInt16()
+        self.__maxSize = max(stream.readUInt16(), maxSize)
         count = stream.readUInt16()
         self.splitterSizes = []
         for i in range(count):
             self.splitterSizes.append(stream.readUInt16())
-        if self.splitter:
-            index = self.splitter.indexOf(self)
-            self.splitterSizes[index] = max(self.splitterSizes[index], minSize) 
         
         self.__autoHide = stream.readBool()
         self.__autoHideButton.setChecked(not self.__autoHide)

eric ide

mercurial