gnue/forms/src/uidrivers/win32/widgets/form wid...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Bajusz Tamás <address@hidden>   03/05/24 07:11:03

Modified files:
        forms/src/uidrivers/win32/widgets/form: widget.py wrappers.py 

Log message:
        eliminating some hardcoded sizing/positioning

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/form/widget.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/win32/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.15 
gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.16
*** gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.15  Thu May  8 
16:14:07 2003
--- gnue/forms/src/uidrivers/win32/widgets/form/widget.py       Sat May 24 
07:11:03 2003
***************
*** 67,76 ****
  
      # Create the main window.
      if self._form._features['GUI:MENUBAR:SUPPRESS']:
!       buttonbarWidth = 0
      else:
        # TODO: calculate
!       buttonbarWidth = 12*(24+8) + 4*6  #buttons and separators
  
      if self._form.style == 'dialog':
        style = win32con.WS_POPUP | win32con.WS_CAPTION | 
win32con.WS_CLIPCHILDREN | win32con.WS_SYSMENU #| win32con.WS_OVERLAPPED
--- 67,83 ----
  
      # Create the main window.
      if self._form._features['GUI:MENUBAR:SUPPRESS']:
!       self.buttonbarWidth = 0
!       self.buttonbarHeight = 0
      else:
        # TODO: calculate
!       self.buttonbarWidth = 12*(24+8) + 4*6  #buttons and separators
!       self.buttonbarHeight = 24+8
! 
!     if object._layout.tabbed:
!       self.tabHeight = self._uiDriver.widgetHeight + 8
!     else:
!       self.tabHeight = 0
  
      if self._form.style == 'dialog':
        style = win32con.WS_POPUP | win32con.WS_CAPTION | 
win32con.WS_CLIPCHILDREN | win32con.WS_SYSMENU #| win32con.WS_OVERLAPPED
***************
*** 79,86 ****
      styleEx = 0
      self.mainWindow = Win32Window(self._uiDriver, styleEx, 
self._uiDriver._wndclass, str(self._form.title),
        style, win32con.CW_USEDEFAULT, 0,
!       max(formWidth*self._uiDriver.widgetWidth+10, buttonbarWidth)+6, # at 
least buttonbar width
!       formHeight*self._uiDriver.widgetHeight+110+20, # TODO: calculate space 
for buttonbar and statusbar and maybe for tabs
        0)
  
      if self._form.style == 'dialog':
--- 86,93 ----
      styleEx = 0
      self.mainWindow = Win32Window(self._uiDriver, styleEx, 
self._uiDriver._wndclass, str(self._form.title),
        style, win32con.CW_USEDEFAULT, 0,
!       max(formWidth*self._uiDriver.widgetWidth+10, self.buttonbarWidth)+6,
!       
formHeight*self._uiDriver.widgetHeight+self.buttonbarHeight+self.tabHeight+75,
        0)
  
      if self._form.style == 'dialog':
Index: gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py:1.7 
gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py:1.8
*** gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py:1.7 Thu May  8 
16:14:08 2003
--- gnue/forms/src/uidrivers/win32/widgets/form/wrappers.py     Sat May 24 
07:11:03 2003
***************
*** 51,59 ****
      styleEx = 0
      self.sw=Win32Window(self.uiform._uiDriver, styleEx, 
self.uiform._uiDriver._wndclass, "ScrollableWrapper", style,
          0, 
!         40, # TODO: size of toolbar
!         formWidth*uiform._uiDriver.widgetWidth+6, # TODO
!         formHeight*uiform._uiDriver.widgetHeight+24, # TODO
          frame)
  
      self._fitted = 0
--- 51,59 ----
      styleEx = 0
      self.sw=Win32Window(self.uiform._uiDriver, styleEx, 
self.uiform._uiDriver._wndclass, "ScrollableWrapper", style,
          0, 
!         self.uiform.buttonbarHeight+4,
!         formWidth*uiform._uiDriver.widgetWidth+6,
!         formHeight*uiform._uiDriver.widgetHeight+self.uiform.tabHeight+4,
          frame)
  
      self._fitted = 0
***************
*** 87,94 ****
      self.pane = Win32Window(self.uiform._uiDriver, styleEx, 
commctrl.WC_TABCONTROL, "tabcontrol", style,
          0, 
          0,
!         formWidth*self.uiform._uiDriver.widgetWidth+6, # TODO
!         formHeight*self.uiform._uiDriver.widgetHeight+22, # TODO
          self.sw, getNextId(), hinst)
  
      self.pane.Show()
--- 87,94 ----
      self.pane = Win32Window(self.uiform._uiDriver, styleEx, 
commctrl.WC_TABCONTROL, "tabcontrol", style,
          0, 
          0,
!         formWidth*self.uiform._uiDriver.widgetWidth+6,
!         formHeight*self.uiform._uiDriver.widgetHeight+self.uiform.tabHeight+4,
          self.sw, getNextId(), hinst)
  
      self.pane.Show()
***************
*** 106,115 ****
      style = win32con.WS_OVERLAPPED | win32con.WS_CHILD #| win32con.WS_BORDER
      styleEx = 0
      newWidget = Win32Page(self.uiform._uiDriver, styleEx, 
self.uiform._uiDriver._wndclass, "tabbedPage", style,
!         2, # TODO
!         28, # TODO
          formWidth*self.uiform._uiDriver.widgetWidth,
!         formHeight*self.uiform._uiDriver.widgetHeight-10, # TODO
          self.pane, getNextId())
  
      # Only show first page
--- 106,115 ----
      style = win32con.WS_OVERLAPPED | win32con.WS_CHILD #| win32con.WS_BORDER
      styleEx = 0
      newWidget = Win32Page(self.uiform._uiDriver, styleEx, 
self.uiform._uiDriver._wndclass, "tabbedPage", style,
!         2,
!         self.uiform.tabHeight,
          formWidth*self.uiform._uiDriver.widgetWidth,
!         formHeight*self.uiform._uiDriver.widgetHeight,
          self.pane, getNextId())
  
      # Only show first page