Skip to content

Commit

Permalink
Add RENDER-WITH and don't make component renderable.
Browse files Browse the repository at this point in the history
  • Loading branch information
Shinmera committed Aug 8, 2019
1 parent 91752f6 commit 526d5db
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion component.lisp
Expand Up @@ -6,5 +6,5 @@

(in-package #:org.shirakumo.alloy)

(defclass component (renderable)
(defclass component ()
())
9 changes: 3 additions & 6 deletions layout.lisp
Expand Up @@ -59,18 +59,15 @@
(defmethod register :after ((element layout-entry) (renderer renderer))
(register (component element) renderer))

(defmethod render ((renderer renderer) (element layout-entry))
(render renderer (component element)))

(defmethod maybe-render ((element layout-entry) (renderer renderer))
(maybe-render (component element) renderer))

(defmethod handle ((event event) (element layout-entry) ui)
(handle event (component element) ui))

(defmethod handle :after ((event pointer-down) (element layout-entry) ui)
(activate (focus-element (component element) ui)))

(defmethod render ((renderer renderer) (element layout-entry))
(render-with renderer element (component element)))

(defmethod suggest-bounds (extent (element layout-entry))
(suggest-bounds extent (component element)))

Expand Down
1 change: 1 addition & 0 deletions package.lisp
Expand Up @@ -128,6 +128,7 @@
#:mark-for-render
#:render
#:maybe-render
#:render-with
#:renderer
#:renderable)
;; ui.lisp
Expand Down
1 change: 1 addition & 0 deletions renderer.lisp
Expand Up @@ -15,6 +15,7 @@
(defgeneric mark-for-render (renderable))
(defgeneric render (renderer renderable))
(defgeneric maybe-render (renderer renderable))
(defgeneric render-with (renderer renderable thing))

(defclass renderer ()
((allocated-p :initform NIL :reader allocated-p)))
Expand Down

0 comments on commit 526d5db

Please sign in to comment.