[gnue] r7583 - in trunk/gnue-forms/src/uidrivers/win32: . widgets

[btami]

Author: btami
Date: 2005-06-08 05:23:12 -0500 (Wed, 08 Jun 2005)
New Revision: 7583

Modified:
   trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/button.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/label.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py
Log:
fixed layout calculation

Modified: trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2005-06-08 08:42:32 UTC 
(rev 7582)
+++ trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2005-06-08 10:23:12 UTC 
(rev 7583)
@@ -28,6 +28,7 @@
 import sys
 import string
 import types
+import math
 
 from gnue.common.apps import i18n
 from gnue.forms.uidrivers._base import Exceptions
@@ -199,6 +200,7 @@
     maxLeading = metrics["tmExternalLeading"]
 
     self.textWidth    = int(maxWidth+maxLeading)  # The pixel width of text 
inside a widget
+    self.textWidth    = int(math.ceil(self.textWidth*1.1))
     self.textHeight   = int(maxHeight+maxDescent)  # The pixel height of text 
inside a widget
     self.widgetWidth  = self.textWidth            # The pixel width of a 1 
char widget (for things like buttons)
     self.widgetHeight = self.textHeight + 5       # The pixel height of a 1 
char widget (for things like buttons)

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/button.py      2005-06-08 
08:42:32 UTC (rev 7582)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/button.py      2005-06-08 
10:23:12 UTC (rev 7583)
@@ -44,7 +44,7 @@
     newWidget = Win32Button(self._uiDriver, styleEx, 'BUTTON', 
textEncode(object.label), style,
                         self.itemX,
                         self.itemY, 
-                        self.itemWidth+4,
+                        self.itemWidth,
                         self.itemHeight+4,
                         event.container, getNextId())
     if event.initialize:

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2005-06-08 
08:42:32 UTC (rev 7582)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2005-06-08 
10:23:12 UTC (rev 7583)
@@ -70,9 +70,8 @@
       
     else: # Normal text box
       height = self.itemHeight + 4
-      width = self.itemWidth + 6
-      style = win32con.WS_CHILD | win32con.ES_NOHIDESEL #| \
-                 #win32con.WS_BORDER #| win32con.ES_AUTOHSCROLL
+      width = self.itemWidth
+      style = win32con.WS_CHILD | win32con.ES_NOHIDESEL #| win32con.WS_BORDER
 
       if hasattr(object,'Char__height') and object.Char__height > 1:
         style = style | win32con.ES_MULTILINE | win32con.ES_AUTOVSCROLL | \

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/label.py       2005-06-08 
08:42:32 UTC (rev 7582)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/label.py       2005-06-08 
10:23:12 UTC (rev 7583)
@@ -42,12 +42,12 @@
 
   def _createWidget(self, event, spacer):
     object = event.object
-    if self.itemWidth == -1:
+    if self.itemWidth == -1:
       self.itemWidth = len(str(textEncode(object.text)))*event.widgetWidth
     if self.itemHeight == -1:
       self.itemHeight = event.widgetHeight
     
-    style = self.alignmentStyle[object.alignment] | win32con.WS_CHILD #| 
win32con.SS_SUNKEN
+    style = self.alignmentStyle[object.alignment] | win32con.WS_CHILD #| 
win32con.WS_BORDER
     styleEx = 0
     newWidget = Win32Window(self._uiDriver, styleEx, 'STATIC', 
textEncode(object.text), style,
                         self.itemX,

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py   2005-06-08 
08:42:32 UTC (rev 7582)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py   2005-06-08 
10:23:12 UTC (rev 7583)
@@ -42,13 +42,13 @@
   def _createWidget(self, event, spacer):
     object = event.object
 
-    style = win32con.WS_CHILD | win32con.WS_VISIBLE |win32con.SBS_VERT | 
win32con.SBS_RIGHTALIGN
+    style = win32con.WS_CHILD | win32con.WS_VISIBLE |win32con.SBS_VERT | 
win32con.SBS_LEFTALIGN
     styleEx = 0
 
     newWidget = self._widget = Win32Window(self._uiDriver, styleEx, 
"Scrollbar", "", style,
                         self.itemX,
                         self.itemY, 
-                        -1 , #object.Char__width*event.widgetWidth,
+                        -1, #object.Char__width*event.widgetWidth,
                         object.Char__height*event.widgetHeight,
                         event.container, getNextId())