[htoolkit-cvs] gio/src/Graphics/UI/GIO Window.hs,1.4,1.5

[<dl...@us...>]

Update of /cvsroot/htoolkit/gio/src/Graphics/UI/GIO
In directory sc8-pr-cvs1:/tmp/cvs-serv17887/src/Graphics/UI/GIO

Modified Files:
	Window.hs 
Log Message:
fixed the relayout mechanism for resizable windows


Index: Window.hs
===================================================================
RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/Window.hs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Window.hs	31 Jan 2003 01:01:45 -0000	1.4
--- Window.hs	31 Jan 2003 20:54:08 -0000	1.5
***************
*** 127,134 ****
  relayoutWindow w
    = do lay    <- getVar (vlayout w)
-        needed <- layoutInWindow (hwindow w) lay
-        avail  <- get w view
         adjust <- get w autosize
!        when (adjust && not (sizeEncloses avail needed)) (set w [view =: needed])
  
  recolorWindow w
--- 127,139 ----
  relayoutWindow w
    = do lay    <- getVar (vlayout w)
         adjust <- get w autosize
!        when adjust (
!          do needed   <- getLayoutSize lay
!             avail    <- get w view
!             isresize <- get w resizeable
!             when ((not isresize && avail /= needed) || (isresize && not (sizeEncloses avail needed)))
!               (do set w [view =: needed]))
!        layoutInWindow (hwindow w) lay
!        return ()
  
  recolorWindow w
***************
*** 141,145 ****
  
  
! -- | Controls wheter the window will automatically resize to display all controls.
  autosize :: Attr Window Bool
  autosize
--- 146,150 ----
  
  
! -- | Controls whether the window will automatically resize to display all controls.
  autosize :: Attr Window Bool
  autosize
***************
*** 172,175 ****
--- 177,181 ----
                          when (x /= resize) (do Lib.setWindowResizeable (hwindow w) x
                                                 setVar (vresizeable w) x))
+ 
  -- | The size of the current view area.
  view :: Attr Window Size