Update of /project/cells/cvsroot/cells/gui-geometry In directory clnet:/tmp/cvs-serv10869/gui-geometry

Modified Files: geo-family.lisp geometer.lisp gui-geometry.lpr Log Message:

--- /project/cells/cvsroot/cells/gui-geometry/geo-family.lisp 2006/11/03 13:37:12 1.10 +++ /project/cells/cvsroot/cells/gui-geometry/geo-family.lisp 2006/11/13 05:28:08 1.11 @@ -30,19 +30,23 @@ (:horizontal :top)))) (spacing :initarg :spacing :initform 0 :accessor spacing)) (:default-initargs - :lr (c? (+ (^outset) + :lr (c? (if (^collapsed) + (^lr-width 0) + (+ (^outset) + (ecase (orientation self) + (:vertical (loop for k in (^kids) + maximizing (l-width k))) + (:horizontal (bif (lk (last1 (^kids))) + (pr lk) 0)))))) + :lb (c? (if (^collapsed) + (^lb-height 0) + (+ (- (^outset)) (ecase (orientation self) (:vertical (loop for k in (^kids) - maximizing (l-width k))) - (:horizontal (bif (lk (last1 (^kids))) - (pr lk) 0))))) - :lb (c? (+ (- (^outset)) - (ecase (orientation self) - (:vertical (loop for k in (^kids) unless (collapsed k) minimizing (pb k))) - (:horizontal (downs (loop for k in (^kids) - maximizing (l-height k))))))) + (:horizontal (downs (loop for k in (^kids) + maximizing (l-height k)))))))) :kid-slots (lambda (self) (ecase (orientation .parent) (:vertical (list @@ -54,9 +58,10 @@ (:horizontal (list (mk-kid-slot (py :if-missing t) (c? (py-self-centered self (justify .parent)))) - (mk-kid-slot (px) + (mk-kid-slot (px :if-missing t) (c? (px-maintain-pl - (^prior-sib-pr self (spacing .parent))))))))))) + (^prior-sib-pr self (spacing .parent))))))))) + ))

(defmodel geo-inline-lazy (geo-zero-tl) ((orientation :initarg :orientation :initform nil :accessor orientation --- /project/cells/cvsroot/cells/gui-geometry/geometer.lisp 2006/10/28 18:20:54 1.11 +++ /project/cells/cvsroot/cells/gui-geometry/geometer.lisp 2006/11/13 05:28:08 1.12 @@ -17,7 +17,7 @@ (in-package #:gui-geometry)

(eval-now! - (export '(outset ^outset mkv2 g-offset g-offset-h g-offset-v collapsed ^collapsed))) + (export '(outset ^outset mkv2 g-offset g-offset-h g-offset-v collapsed ^collapsed inset ^inset)))

(defmd geometer () px py ll lt lr lb @@ -59,6 +59,8 @@ (mkr (ll geo) (lt geo) (lr geo) (lb geo)))

;---------- gOffset ------------------- + +(export! offset-within) ; (defun offset-within (inner outer &optional dbg) (declare (ignorable dbg)) --- /project/cells/cvsroot/cells/gui-geometry/gui-geometry.lpr 2006/10/28 18:20:54 1.6 +++ /project/cells/cvsroot/cells/gui-geometry/gui-geometry.lpr 2006/11/13 05:28:08 1.7 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Oct 17, 2006 12:56)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Nov 6, 2006 16:43)"; cg: "1.81"; -*-

(in-package :cg-user)