From 4c2cd48d9a3c5c6abc050531a5a181a17953bf82 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 2 Sep 2008 13:02:38 -0500 Subject: [PATCH] new accessors, slight refactoring --- basis/ui/gadgets/canvas/canvas.factor | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/basis/ui/gadgets/canvas/canvas.factor b/basis/ui/gadgets/canvas/canvas.factor index ba5aeaf95b..b137fd888d 100644 --- a/basis/ui/gadgets/canvas/canvas.factor +++ b/basis/ui/gadgets/canvas/canvas.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: ui.backend ui.gadgets ui.gadgets.theme ui.gadgets.lib ui.gadgets.worlds ui.render opengl opengl.gl kernel namespaces -classes.tuple colors ; +classes.tuple colors accessors ; IN: ui.gadgets.canvas TUPLE: canvas < gadget dlist ; @@ -11,16 +11,16 @@ TUPLE: canvas < gadget dlist ; new-gadget black solid-interior ; inline : delete-canvas-dlist ( canvas -- ) - dup find-gl-context - dup canvas-dlist [ delete-dlist ] when* - f swap set-canvas-dlist ; + [ find-gl-context ] + [ dlist>> [ delete-dlist ] when* ] + [ f >>dlist drop ] tri ; : make-canvas-dlist ( canvas quot -- dlist ) - over >r GL_COMPILE swap make-dlist dup r> - set-canvas-dlist ; + [ GL_COMPILE ] dip make-dlist + [ >>dlist drop ] keep ; : cache-canvas-dlist ( canvas quot -- dlist ) - over canvas-dlist dup + over dlist>> dup [ 2nip ] [ drop make-canvas-dlist ] if ; inline : draw-canvas ( canvas quot -- )