E5Gui/E5SideBar.py

branch
5_1_x
changeset 1412
c733a118f4ca
parent 1397
acc61b0fb135
child 1414
7d19eb1c0249
--- a/E5Gui/E5SideBar.py	Mon Oct 31 16:30:37 2011 +0100
+++ b/E5Gui/E5SideBar.py	Tue Nov 01 12:23:16 2011 +0100
@@ -109,10 +109,10 @@
         self.__minimized = True
         self.__bigSize = self.size()
         if self.__orientation in [E5SideBar.North, E5SideBar.South]:
-            self.__minSize = max(self.minimumHeight(), self.__minimum)
+            self.__minSize = self.minimumSizeHint().height()
             self.__maxSize = self.maximumHeight()
         else:
-            self.__minSize = max(self.minimumWidth(), self.__minimum)
+            self.__minSize = self.minimumSizeHint().width()
             self.__maxSize = self.maximumWidth()
         if self.splitter:
             self.splitterSizes = self.splitter.sizes()
@@ -203,6 +203,10 @@
         else:
             self.__tabBar.addTab(iconOrLabel)
         self.__stackedWidget.addWidget(widget)
+        if self.__orientation in [E5SideBar.North, E5SideBar.South]:
+            self.__minSize = self.minimumSizeHint().height()
+        else:
+            self.__minSize = self.minimumSizeHint().width()
     
     def insertTab(self, index, widget, iconOrLabel, label = None):
         """
@@ -220,6 +224,10 @@
         else:
             self.__tabBar.insertTab(index, iconOrLabel)
         self.__stackedWidget.insertWidget(index, widget)
+        if self.__orientation in [E5SideBar.North, E5SideBar.South]:
+            self.__minSize = self.minimumSizeHint().height()
+        else:
+            self.__minSize = self.minimumSizeHint().width()
     
     def removeTab(self, index):
         """
@@ -229,6 +237,10 @@
         """
         self.__stackedWidget.removeWidget(self.__stackedWidget.widget(index))
         self.__tabBar.removeTab(index)
+        if self.__orientation in [E5SideBar.North, E5SideBar.South]:
+            self.__minSize = self.minimumSizeHint().height()
+        else:
+            self.__minSize = self.minimumSizeHint().width()
     
     def clear(self):
         """
@@ -459,10 +471,10 @@
                 self.splitterSizes = self.splitter.sizes()
             self.__bigSize = self.size()
             if self.__orientation in [E5SideBar.North, E5SideBar.South]:
-                self.__minSize = self.minimumHeight()
+                self.__minSize = self.minimumSizeHint().height()
                 self.__maxSize = self.maximumHeight()
             else:
-                self.__minSize = self.minimumWidth()
+                self.__minSize = self.minimumSizeHint().width()
                 self.__maxSize = self.maximumWidth()
         
         data = QByteArray()

eric ide

mercurial