r6685 - in trunk/gnue-forms/src/uidrivers/win32: . widgets widgets/form

[btami]

Author: btami
Date: 2004-11-16 15:46:24 -0600 (Tue, 16 Nov 2004)
New Revision: 6685

Modified:
   trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/box.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/form/widget.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/label.py
Log:
fixed some size/position issues in win32 uidriver

Modified: trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2004-11-16 21:44:01 UTC 
(rev 6684)
+++ trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2004-11-16 21:46:24 UTC 
(rev 6685)
@@ -194,7 +194,7 @@
     self.textWidth    = int(maxWidth+maxLeading)  # The pixel width of text 
inside a widget
     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 + 3       # The pixel height 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)
 
     #
     # Close dummy window so app doesn't hang when all other windows closed

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/box.py 2004-11-16 21:44:01 UTC 
(rev 6684)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/box.py 2004-11-16 21:46:24 UTC 
(rev 6685)
@@ -44,13 +44,15 @@
     h = int (event.widgetHeight / 8)
 
     object = event.object
+    itemHeight = object.Char__height * event.widgetHeight - int( 
event.widgetHeight /2)
+    
     style = win32con.WS_CHILD | win32con.BS_GROUPBOX | win32con.WS_GROUP 
     styleEx = 0
     newWidget = Win32Window(self._uiDriver, styleEx, 'BUTTON', 
textEncode(object.label), style,
                        self.itemX + w,
                        self.itemY + h,
-                       self.itemWidth + 0 * w,
-                       self.itemHeight + 8 * h,
+                       self.itemWidth + w,
+                       itemHeight ,
                        event.container)
     return newWidget
 

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/button.py      2004-11-16 
21:44:01 UTC (rev 6684)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/button.py      2004-11-16 
21:46:24 UTC (rev 6685)
@@ -46,7 +46,7 @@
     newWidget = Win32Button(self._uiDriver, styleEx, 'BUTTON', 
textEncode(object.label), style,
                         self.itemX,
                         self.itemY, 
-                        self.itemWidth,
+                        self.itemWidth+4,
                         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       2004-11-16 
21:44:01 UTC (rev 6684)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2004-11-16 
21:46:24 UTC (rev 6685)
@@ -43,8 +43,8 @@
     object = event.object
 
     ostyle = object.style
-    height = self.itemHeight + 2
-    width = self.itemWidth + 8
+    height = self.itemHeight
+    width = self.itemWidth
     title = ""
     
     if ostyle == 'dropdown':
@@ -71,6 +71,8 @@
       title = object.label
       
     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
 

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2004-11-16 
21:44:01 UTC (rev 6684)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2004-11-16 
21:46:24 UTC (rev 6685)
@@ -71,15 +71,13 @@
       self.buttonbarHeight = 0
     else:
       # TODO: calculate
-      self.buttonbarWidth = 14*(24+8) + 5  #buttons and separators
+      self.buttonbarWidth = 14*(24+8) + 5*7 #buttons and separators
       self.buttonbarHeight = 24+8
 
     if object._layout.tabbed != 'none':
       self.tabHeight = self._uiDriver.widgetHeight + 8
-      self.tabWidth = self._uiDriver.widgetWidth + 10
     else:
       self.tabHeight = 0
-      self.tabWidth = 0
 
     if self._form.style == 'dialog':
       style = win32con.WS_POPUP | win32con.WS_CAPTION | 
win32con.WS_CLIPCHILDREN | win32con.WS_SYSMENU #| win32con.WS_OVERLAPPED
@@ -88,7 +86,7 @@
     styleEx = 0
     self.mainWindow = Win32Window(self._uiDriver, styleEx, 
self._uiDriver._wndclass, textEncode(self._form.title),
       style, win32con.CW_USEDEFAULT, 0,
-      max(formWidth*self._uiDriver.widgetWidth+10, 
self.buttonbarWidth)+self.tabWidth+10,
+      max(formWidth*self._uiDriver.widgetWidth+20, self.buttonbarWidth),
       
formHeight*self._uiDriver.widgetHeight+self.buttonbarHeight+self.tabHeight+90,
       0)
 
@@ -115,8 +113,8 @@
       ToolBar(self._uiDriver, self.mainWindow, self._form)
 
 
-#    if not self._form._features['GUI:STATUSBAR:SUPPRESS']:
-    if self._form.style != 'dialog':
+    # and the Statusbar
+    if not self._form._features['GUI:STATUSBAR:SUPPRESS']:
       hinst = win32api.GetModuleHandle(None)
       style = win32con.WS_CHILD | win32con.WS_VISIBLE | commctrl.SBARS_SIZEGRIP
       styleEx = 0

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py       
2004-11-16 21:44:01 UTC (rev 6684)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py       
2004-11-16 21:46:24 UTC (rev 6685)
@@ -43,16 +43,15 @@
 
     formWidth = int(form._layout.Char__width)
     formHeight = int(form._layout.Char__height)
-    self.layoutSize = (formWidth*uiform._uiDriver.widgetWidth,
-                      formHeight*uiform._uiDriver.widgetHeight)
 
     style = win32con.WS_OVERLAPPED | win32con.WS_CHILD #| \
                #win32con.WS_VSCROLL | win32con.WS_HSCROLL
     styleEx = 0
     self.sw=Win32Window(self.uiform._uiDriver, styleEx, 
self.uiform._uiDriver._wndclass, "ScrollableWrapper", style,
         2, 
-        self.uiform.buttonbarHeight+4,
-        formWidth*uiform._uiDriver.widgetWidth+self.uiform.tabWidth+8,
+        self.uiform.buttonbarHeight+4,
+        max(formWidth*uiform._uiDriver.widgetWidth, 
self.uiform.buttonbarWidth)+8,
+        #formWidth*uiform._uiDriver.widgetWidth+8,
         formHeight*uiform._uiDriver.widgetHeight+self.uiform.tabHeight+6,
         frame)
 
@@ -90,7 +89,7 @@
     self.pane = Win32Window(self.uiform._uiDriver, styleEx, 
commctrl.WC_TABCONTROL, "tabcontrol", style,
         2, 
         2,
-        formWidth*self.uiform._uiDriver.widgetWidth+self.uiform.tabWidth+6,
+        formWidth*self.uiform._uiDriver.widgetWidth+6,
         formHeight*self.uiform._uiDriver.widgetHeight+self.uiform.tabHeight+4,
         self.sw, getNextId(), hinst)
 
@@ -167,13 +166,14 @@
 
     ScrollableWrapper.__init__(self, *args, **parms)
     formWidth = int(self.form._layout.Char__width)
-    formHeight = int(self.form._layout.Char__height)
+    formHeight = int(self.form._layout.Char__height)
+
     style = win32con.WS_OVERLAPPED | win32con.WS_CHILD #| win32con.WS_BORDER
     styleEx = 0
     self.pane = Win32Window(self.uiform._uiDriver, styleEx, 
self.uiform._uiDriver._wndclass, "PlainWrapper", style,
         0, 
         0,
-        formWidth*self.uiform._uiDriver.widgetWidth,
+        max(formWidth*self.uiform._uiDriver.widgetWidth, 
self.uiform.buttonbarWidth)+8,
         formHeight*self.uiform._uiDriver.widgetHeight,
         self.sw, getNextId())
 
@@ -188,7 +188,7 @@
     newWidget = Win32Page(self.uiform._uiDriver, styleEx, 
self.uiform._uiDriver._wndclass, "plainPage", style,
         0, 
         0,
-        formWidth*self.uiform._uiDriver.widgetWidth,
+        max(formWidth*self.uiform._uiDriver.widgetWidth, 
self.uiform.buttonbarWidth)+8,
         formHeight*self.uiform._uiDriver.widgetHeight,
         self.pane, getNextId())
 

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/label.py       2004-11-16 
21:44:01 UTC (rev 6684)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/label.py       2004-11-16 
21:46:24 UTC (rev 6685)
@@ -38,22 +38,23 @@
 # Widget set specific function that creates a single instance of a label
 #
 class UILabel(UIHelper):
-  alignmentStyle = { 'left'  : win32con.SS_LEFT | win32con.WS_CHILD,
-                     'center': win32con.SS_CENTER | win32con.WS_CHILD,
-                     'right' : win32con.SS_RIGHT | win32con.WS_CHILD
-                     }
+  alignmentStyle = {'left'  : win32con.SS_LEFT,
+                    'center': win32con.SS_CENTER,
+                    'right' : win32con.SS_RIGHT}
 
   def _createWidget(self, event, spacer):
     object = event.object
     if self.itemWidth == -1:
       self.itemWidth = len(str(object.text))*event.widgetWidth
     if self.itemHeight == -1:
-      self.itemHeight = event.widgetHeight
-    style = self.alignmentStyle[object.alignment]
+      self.itemHeight = event.widgetHeight
+    
+    style = self.alignmentStyle[object.alignment] | win32con.WS_CHILD #| 
win32con.SS_SUNKEN
     styleEx = 0
     newWidget = Win32Window(self._uiDriver, styleEx, 'STATIC', 
textEncode(object.text), style,
                         self.itemX,
-                        self.itemY, 
+    # Make sure the baseline of labels and widgets are the same
+                        self.itemY + 3,
                         self.itemWidth,
                         self.itemHeight,
                         event.container)