[cells-cvs] CVS cells/gui-geometry

[ktilton]

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

Modified Files:
	geo-data-structures.lisp geo-family.lisp geometer.lisp 
	gui-geometry.lpr 
Log Message:
I forget. Some interesting stuff, I think.

--- /project/cells/cvsroot/cells/gui-geometry/geo-data-structures.lisp	2006/10/17 21:28:39	1.7
+++ /project/cells/cvsroot/cells/gui-geometry/geo-data-structures.lisp	2006/10/28 18:20:54	1.8
@@ -158,6 +158,12 @@
 (defun r-top-left (r)
   (mkv2 (r-left r) (r-top r)))
 
+(export! r-center)
+
+(defun r-center (r)
+  (mkv2 (/ (+ (r-left r)(r-right r)) 2)
+    (/ (+ (r-top r)(r-bottom r)) 2)))
+
 (defun r-bottom-right (r)
   (mkv2 (r-bottom r) (r-right r)))
 
--- /project/cells/cvsroot/cells/gui-geometry/geo-family.lisp	2006/10/17 21:28:39	1.8
+++ /project/cells/cvsroot/cells/gui-geometry/geo-family.lisp	2006/10/28 18:20:54	1.9
@@ -40,7 +40,7 @@
               (ecase (orientation self)
                 (:vertical (loop for k in (^kids)
                                  unless (collapsed k)
-                                 maximizing (pb k)))
+                                 minimizing (pb k)))
                 (:horizontal (downs (loop for k in (^kids)
                                         maximizing (l-height k)))))))
     :kid-slots (lambda (self)
--- /project/cells/cvsroot/cells/gui-geometry/geometer.lisp	2006/10/17 21:28:39	1.10
+++ /project/cells/cvsroot/cells/gui-geometry/geometer.lisp	2006/10/28 18:20:54	1.11
@@ -17,7 +17,7 @@
 (in-package #:gui-geometry)
 
 (eval-now!
-  (export '(outset ^outset mkv2 g-offset g-offset-h g-offset-v)))
+  (export '(outset ^outset mkv2 g-offset g-offset-h g-offset-v collapsed ^collapsed)))
 
 (defmd geometer ()
   px py ll lt lr lb
@@ -341,7 +341,7 @@
    (ecase justify
      (:top  0)
      (:center (floor (- (inset-height .parent) (l-height self)) -2))
-     (:bottom (- (inset-height .parent) (l-height self))))))
+     (:bottom (downs (- (inset-height .parent) (l-height self)))))))
 
 (defmacro ^fill-parent-right (&optional (inset 0))
   `(lr-maintain-pr (- (inset-lr .parent) ,inset)))
--- /project/cells/cvsroot/cells/gui-geometry/gui-geometry.lpr	2006/10/02 02:38:32	1.5
+++ /project/cells/cvsroot/cells/gui-geometry/gui-geometry.lpr	2006/10/28 18:20:54	1.6
@@ -1,4 +1,4 @@
-;; -*- lisp-version: "8.0 [Windows] (Aug 24, 2006 21:48)"; cg: "1.81"; -*-
+;; -*- lisp-version: "8.0 [Windows] (Oct 17, 2006 12:56)"; cg: "1.81"; -*-
 
 (in-package :cg-user)