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

[btami]

Author: btami
Date: 2006-11-10 06:36:44 -0600 (Fri, 10 Nov 2006)
New Revision: 9023

Modified:
   trunk/gnue-forms/src/uidrivers/win32/UIdriver.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
Log:
use default system font for widgets

Modified: trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2006-11-10 12:35:05 UTC 
(rev 9022)
+++ trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2006-11-10 12:36:44 UTC 
(rev 9023)
@@ -163,11 +163,14 @@
     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.textWidth    = int(self.textWidth)
     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)
+    self.widgetHeight = self.textHeight + 4       # The pixel height of a 1 
char widget (for things like buttons)
 
+    font_spec = {'name':font_name, 'height':int(gConfigForms('pointSize')) or 
-1}
+    self._font = win32ui.CreateFont(font_spec)
+
     dummyWindow.ReleaseDC(dc)
 
 

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2006-11-10 
12:35:05 UTC (rev 9022)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2006-11-10 
12:36:44 UTC (rev 9023)
@@ -71,7 +71,7 @@
       title = object.label
       
     else: # Normal text box
-      height = self.itemHeight + 4
+      height = self.itemHeight + 2
       width = self.itemWidth
       style = win32con.WS_CHILD | win32con.ES_NOHIDESEL #| win32con.WS_BORDER
 

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-11-10 
12:35:05 UTC (rev 9022)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-11-10 
12:36:44 UTC (rev 9023)
@@ -100,11 +100,11 @@
       self.buttonbarHeight = 0
     else:
       # TODO: calculate
-      self.buttonbarWidth = 14*(24+8) + 5*7 #buttons and separators
+      self.buttonbarWidth = 13*(24+8) + 5*7 #buttons and separators
       self.buttonbarHeight = 24+8
 
     if object._layout.tabbed != 'none':
-      self.tabHeight = self._uiDriver.widgetHeight + 8
+      self.tabHeight = self._uiDriver.widgetHeight + 6
     else:
       self.tabHeight = 0
 
@@ -116,7 +116,7 @@
     self.mainWindow = Win32Window(self._uiDriver, styleEx, 
self._uiDriver._wndclass, textEncode(self._form.title),
       style, win32con.CW_USEDEFAULT, 0,
       max(formWidth*self._uiDriver.widgetWidth+20, self.buttonbarWidth),
-      
formHeight*self._uiDriver.widgetHeight+self.buttonbarHeight+self.tabHeight+90,
+      
formHeight*self._uiDriver.widgetHeight+self.buttonbarHeight+self.tabHeight+83,
       0)
 
     self._uiDriver._win32app._MainWindowList.append(self.mainWindow)

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py       
2006-11-10 12:35:05 UTC (rev 9022)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py       
2006-11-10 12:36:44 UTC (rev 9023)
@@ -46,7 +46,7 @@
     formWidth = int(form._layout.Char__width)
     formHeight = int(form._layout.Char__height)
 
-    style = win32con.WS_OVERLAPPED | win32con.WS_CHILD #| \
+    style = win32con.WS_OVERLAPPED | win32con.WS_CHILD #| win32con.WS_BORDER
                #win32con.WS_VSCROLL | win32con.WS_HSCROLL
     styleEx = 0
     self.sw=Win32Window(self.uiform._uiDriver, styleEx, 
self.uiform._uiDriver._wndclass, "ScrollableWrapper", style,
@@ -54,7 +54,7 @@
         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,
+        formHeight*uiform._uiDriver.widgetHeight+self.uiform.tabHeight,
         frame)
 
     self._fitted = 0
@@ -91,8 +91,8 @@
     self.pane = Win32Window(self.uiform._uiDriver, styleEx, 
commctrl.WC_TABCONTROL, "tabcontrol", style,
         2, 
         2,
-        formWidth*self.uiform._uiDriver.widgetWidth+6,
-        formHeight*self.uiform._uiDriver.widgetHeight+self.uiform.tabHeight+4,
+        max(formWidth*self.uiform._uiDriver.widgetWidth+6, 
self.uiform.buttonbarWidth-16),
+        formHeight*self.uiform._uiDriver.widgetHeight+self.uiform.tabHeight-6,
         self.sw, getNextId(), hinst)
 
     self.pane.Show()