More layout fixes

layout.lisp

@@ -23,21 +23,26 @@
          (let ((layout-tree (parent element)))
            (setf (slot-value element 'layout-tree) layout-tree)
            (setf (slot-value element 'parent) NIL)
-           (setf (root (parent element)) element)))
+           (setf (root layout-tree) element)))
         (T
          (setf (slot-value element 'layout-tree) (layout-tree (parent element)))
          (enter element (parent element)))))
 
+(defmethod print-object ((element layout-element) stream)
+  (print-unreadable-object (element stream :type T :identity T)
+    (format stream "~a" (bounds element))))
+
 (defmethod (setf bounds) ((extent extent) (element layout-element))
-  (let ((current (extent element)))
+  (let ((current (bounds element)))
     (setf (extent-x current) (extent-x extent))
     (setf (extent-y current) (extent-y extent))
     (setf (extent-w current) (extent-w extent))
     (setf (extent-h current) (extent-h extent))
     extent))
 
 (defmethod (setf bounds) :after (extent (element layout-element))
-  (notice-bounds element (parent element)))
+  (when (parent element)
+    (notice-bounds element (parent element))))
 
 (defmethod x ((element layout-element)) (extent-x (bounds element)))
 (defmethod y ((element layout-element)) (extent-y (bounds element)))

layouts/linear.lisp

@@ -6,7 +6,7 @@
 
 (in-package #:org.shirakumo.alloy)
 
-(defclass linear-layout (layout)
+(defclass linear-layout (layout vector-container)
   ((min-size :initarg :min-size :initform (size) :accessor min-size)
    (stretch :initarg :stretch :initform T :accessor stretch)
    (align :initarg :align :initform :start :accessor align)))
@@ -22,8 +22,9 @@
 (defmethod (setf min-size) :after (value (layout linear-layout))
   (update-linear-layout layout 0 (bounds layout)))
 
-(defmethod notice-bounds :after ((element layout-element) (layout linear-layout))
-  (let ((updated (update-linear-layout layout (element-index element layout) (bounds layout))))
+(defmethod notice-bounds ((element layout-element) (layout linear-layout))
+  ;; FIXME: optimise bounds update.
+  (let ((updated (update-linear-layout layout 0 (bounds layout))))
     (unless (extent= (bounds layout) updated)
       (setf (bounds layout) updated))))
 

package.lisp

@@ -142,6 +142,14 @@
    #:component
    #:layout
    #:layout-tree)
+  ;; layouts/fixed.lisp
+  (:export
+   #:fixed-layout)
+  ;; layouts/linear.lisp
+  (:export
+   #:linear-layout
+   #:vertical-linear-layout
+   #:horizontal-linear-layout)
   ;; renderer
   (:export
    #:allocate