r6458 - trunk/gnue-forms/src/uidrivers/win32/widgets

[btami]

Author: btami
Date: 2004-10-06 16:33:33 -0500 (Wed, 06 Oct 2004)
New Revision: 6458

Modified:
   trunk/gnue-forms/src/uidrivers/win32/widgets/_base.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/image.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/label.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py
Log:
better widget positioning

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2004-10-06 
18:13:44 UTC (rev 6457)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2004-10-06 
21:33:33 UTC (rev 6458)
@@ -235,8 +235,8 @@
     else:
       return win32gui.CallWindowProc(self._oldWndProc, hwnd, msg, wParam, 
lParam)
 
-  def SetFont(self,font):
-    self._PyCWnd.SetFont(font,1)
+  def SetFont(self,font):
+      self._PyCWnd.SetFont(font,1)
 
   def GetId(self):
     return self._id
@@ -538,9 +538,19 @@
     self.widgets[index].setSelectedArea(selection1, selection2)
 
   def createWidget(self, event, spacer):
+    gfObject = event.object
+
+    if hasattr (gfObject, 'Char__y'):
+      posY = gfObject.Char__y
+      gap  = gfObject._gap + 1
+      self.itemY = (posY + spacer * gap) * event.widgetHeight
+
     newWidget = self._createWidget(event, spacer)
     newWidget.SetFont(self._uiDriver._font)
-    self._addToCrossRef(newWidget,event.object,self)
+    if event.initialize:
+      self._eventHandler = event.eventHandler
+      self._addToCrossRef(newWidget,gfObject,self)
+
     return newWidget
 
   def cleanup(self, object):

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/box.py 2004-10-06 18:13:44 UTC 
(rev 6457)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/box.py 2004-10-06 21:33:33 UTC 
(rev 6458)
@@ -38,16 +38,19 @@
 #
 class UIBox(UIHelper):
     
-  def _createWidget(self, event, spacer):
+  def _createWidget(self, event, spacer):
 
+    w = int (event.widgetWidth / 2)
+    h = int (event.widgetHeight / 8)
+
     object = event.object
     style = win32con.WS_CHILD | win32con.BS_GROUPBOX | win32con.WS_GROUP 
     styleEx = 0
     newWidget = Win32Window(self._uiDriver, styleEx, 'BUTTON', 
textEncode(object.label), style,
-                       object.Char__x*event.widgetWidth+(event.widgetWidth/2),
-                       
(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight+(event.widgetHeight/2),
-                       (object.Char__width-1)*event.widgetWidth,
-                       (object.Char__height-1)*event.widgetHeight,
+                       self.itemX + w,
+                       self.itemY + h,
+                       self.itemWidth + 0 * w,
+                       self.itemHeight + 8 * h,
                        event.container)
     return newWidget
 

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/button.py      2004-10-06 
18:13:44 UTC (rev 6457)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/button.py      2004-10-06 
21:33:33 UTC (rev 6458)
@@ -44,13 +44,12 @@
     style = win32con.BS_PUSHBUTTON | win32con.WS_CHILD
     styleEx = 0
     newWidget = Win32Button(self._uiDriver, styleEx, 'BUTTON', 
textEncode(object.label), style,
-                        object.Char__x*event.widgetWidth,
-                        
(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight, 
-                        object.Char__width*event.widgetWidth+8,
-                        object.Char__height*event.widgetHeight,
+                        self.itemX,
+                        self.itemY, 
+                        self.itemWidth,
+                        self.itemHeight+4,
                         event.container, getNextId())
     if event.initialize:
-      self._eventHandler = event.eventHandler
       event.container.Connect(newWidget.GetId(), self.buttonHandler)
 
     return newWidget

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2004-10-06 
18:13:44 UTC (rev 6457)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2004-10-06 
21:33:33 UTC (rev 6458)
@@ -43,8 +43,8 @@
     object = event.object
 
     ostyle = object.style
-    height = self.itemHeight+2
-    width = self.itemWidth+8
+    height = self.itemHeight + 2
+    width = self.itemWidth + 8
     title = ""
     
     if ostyle == 'dropdown':
@@ -83,8 +83,8 @@
       className = "EDIT"
 
     newWidget = Win32Entry(self._uiDriver, styleEx, className, title, style,
-                        object.Char__x*event.widgetWidth,
-                        
(object.Char__y+spacer+(object._gap*spacer))*event.widgetHeight,
+                        self.itemX,
+                        self.itemY, 
                         width,
                         height,
                         event.container, getNextId())
@@ -106,7 +106,6 @@
         newWidget._origAllowedValues = object._field._allowedValues
         newWidget.SetValue("")
 
-    self._eventHandler = event.eventHandler
     return newWidget
 
 

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/image.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/image.py       2004-10-06 
18:13:44 UTC (rev 6457)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/image.py       2004-10-06 
21:33:33 UTC (rev 6458)
@@ -43,8 +43,8 @@
     style = win32con.WS_CHILD | win32con.WS_VISIBLE | win32con.SS_BITMAP
     styleEx = 0
     newWidget = Win32Image(self._uiDriver, styleEx, 'STATIC', '', style,
-                        object.Char__x*event.widgetWidth,
-                        
(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight, 
+                        self.itemX,
+                        self.itemY, 
                         self.itemWidth,
                         self.itemHeight,
                         event.container, getNextId())

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/label.py       2004-10-06 
18:13:44 UTC (rev 6457)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/label.py       2004-10-06 
21:33:33 UTC (rev 6458)
@@ -51,8 +51,8 @@
     style = self.alignmentStyle[object.alignment]
     styleEx = 0
     newWidget = Win32Window(self._uiDriver, styleEx, 'STATIC', 
textEncode(object.text), style,
-                        object.Char__x*event.widgetWidth,
-                        
(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight, 
+                        self.itemX,
+                        self.itemY, 
                         self.itemWidth,
                         self.itemHeight,
                         event.container)

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py   2004-10-06 
18:13:44 UTC (rev 6457)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py   2004-10-06 
21:33:33 UTC (rev 6458)
@@ -48,14 +48,13 @@
     styleEx = 0
 
     newWidget = self._widget = Win32Window(self._uiDriver, styleEx, 
"Scrollbar", "", style,
-                        object.Char__x*event.widgetWidth,
-                        (object.Char__y+spacer)*event.widgetHeight,
-                        object.Char__width*event.widgetWidth,
+                        self.itemX,
+                        self.itemY, 
+                        -1 , #object.Char__width*event.widgetWidth,
                         object.Char__height*event.widgetHeight,
                         event.container, getNextId())
 
     if event.initialize:
-      self._eventHandler = event.eventHandler
       object._block.registerScrollbar(self)
       self._rows = object._block._rows
       self._hwnd = newWidget.GetHwnd()