Author: junrue Date: Sun Jun 4 13:24:24 2006 New Revision: 149

Modified: trunk/src/uitoolkit/widgets/flow-layout.lisp Log: fixed a couple flow-layout regressions

Modified: trunk/src/uitoolkit/widgets/flow-layout.lisp ============================================================================== --- trunk/src/uitoolkit/widgets/flow-layout.lisp (original) +++ trunk/src/uitoolkit/widgets/flow-layout.lisp Sun Jun 4 13:24:24 2006 @@ -163,10 +163,12 @@

(defun flow-container-layout (layout visible kids width-hint height-hint) (let ((flows nil) - (state (init-flow-data layout visible kids -1 -1))) + (state (init-flow-data layout visible kids width-hint height-hint))) (loop with wrap = (find :wrap (style-of layout)) for (kid kid-size) in (flow-data-kid-sizes state) - do (if (and wrap (wrap-needed-p state layout kid-size)) + do (if (and wrap + (flow-data-current state) + (wrap-needed-p state layout kid-size)) (setf flows (append flows (wrap-flow state layout)))) (push (new-flow-element state layout kid kid-size) (flow-data-current state))) (if (flow-data-current state)