[Thuban-commits] r2766 - in trunk/thuban: . Thuban/UI

[scm-commit@wald.intevation.org]

Author: dpinte
Date: 2007-05-03 01:37:02 +0200 (Thu, 03 May 2007)
New Revision: 2766

Modified:
   trunk/thuban/ChangeLog
   trunk/thuban/Thuban/UI/classifier.py
   trunk/thuban/Thuban/UI/dock.py
Log:
2007-05-03  Didrik Pinte <dpinte at itae.be>

    * Thuban/UI/dock.py, classifier.py : Little fixes with GetSize methods



Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog	2007-04-25 19:36:27 UTC (rev 2765)
+++ trunk/thuban/ChangeLog	2007-05-02 23:37:02 UTC (rev 2766)
@@ -1,3 +1,7 @@
+2007-05-03  Didrik Pinte <dpinte at itae.be>
+
+	* Thuban/UI/dock.py, classifier.py : Little fixes with GetSize methods
+
 2007-04-25  Didrik Pinte <dpinte at itae.be>
 	
 	* Releasenotes.txt : win32 installer warning added

Modified: trunk/thuban/Thuban/UI/classifier.py
===================================================================
--- trunk/thuban/Thuban/UI/classifier.py	2007-04-25 19:36:27 UTC (rev 2765)
+++ trunk/thuban/Thuban/UI/classifier.py	2007-05-02 23:37:02 UTC (rev 2766)
@@ -1378,7 +1378,8 @@
         if rect is None:
             x = 0
             y = 0
-            w, h = dc.GetSize()
+            w = dc.GetSize().GetWidth()
+            h = dc.GetSize().GetHeight()
         else:
             x = rect.GetX()
             y = rect.GetY()

Modified: trunk/thuban/Thuban/UI/dock.py
===================================================================
--- trunk/thuban/Thuban/UI/dock.py	2007-04-25 19:36:27 UTC (rev 2765)
+++ trunk/thuban/Thuban/UI/dock.py	2007-05-02 23:37:02 UTC (rev 2766)
@@ -245,13 +245,13 @@
     def SetDockSize(self, rect = None):
         """Set the size of the dock window to rect."""
 
-        w0, h0 = self.__dockPanel.GetBestSize()
-        w, h = self.__panel.GetBestSize()
-
-        if (w, h) < (w0, h0):
-            w = w0
-            h = h0
-
+        dockSize = self.__dockPanel.GetBestSize()
+        panelSize = self.__panel.GetBestSize()
+        
+        panelSize.IncTo(dockSize)
+        w = panelSize.GetWidth()
+        h = panelSize.GetHeight()
+        
         if rect is not None:
             rw = rect.width
             rh = rect.height