From 0714bb7a86352fd76ecd8a752c962e05fd6dd7f0 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 21 Nov 2007 04:19:50 -0500 Subject: [PATCH] Revert incomplete changes --- .../ui/gadgets/incremental/incremental.factor | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/extra/ui/gadgets/incremental/incremental.factor b/extra/ui/gadgets/incremental/incremental.factor index 3e068ead45..a5c7431d36 100755 --- a/extra/ui/gadgets/incremental/incremental.factor +++ b/extra/ui/gadgets/incremental/incremental.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2005, 2007 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: io kernel math namespaces math.vectors ui.gadgets -dlists ; +USING: io kernel math namespaces math.vectors ui.gadgets ; IN: ui.gadgets.incremental ! Incremental layout allows adding lines to panes to be O(1). @@ -15,14 +14,12 @@ IN: ui.gadgets.incremental ! New gadgets are added at ! incremental-cursor gadget-orientation v* -TUPLE: incremental cursor queue ; +TUPLE: incremental cursor ; : ( pack -- incremental ) - dup pref-dim { - set-gadget-delegate - set-incremental-cursor - set-incremental-queue - } incremental construct ; + dup pref-dim + { set-gadget-delegate set-incremental-cursor } + incremental construct ; M: incremental pref-dim* dup gadget-layout-state [ @@ -43,17 +40,17 @@ M: incremental pref-dim* swap set-rect-loc ; : prefer-incremental ( gadget -- ) - dup forget-pref-dim dup pref-dim swap set-rect-dim ; + dup forget-pref-dim dup pref-dim over set-rect-dim + layout ; : add-incremental ( gadget incremental -- ) not-in-layout - 2dup incremental-queue push-front - add-gadget ; - -: (add-incremental) ( gadget incremental -- ) + 2dup (add-gadget) + over prefer-incremental 2dup incremental-loc tuck update-cursor - prefer-incremental ; + dup prefer-incremental + gadget-parent [ invalidate* ] when* ; : clear-incremental ( incremental -- ) not-in-layout