From fd2d136df6f3972c479c5c4b253510b874629ba6 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Sat, 24 Nov 2007 23:57:37 -0500
Subject: [PATCH] UI fixes
---
extra/ui/cocoa/cocoa.factor | 2 +-
extra/ui/gadgets/incremental/incremental.factor | 4 ++--
extra/ui/ui.factor | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/extra/ui/cocoa/cocoa.factor b/extra/ui/cocoa/cocoa.factor
index 7492ad19b7..1e46544180 100755
--- a/extra/ui/cocoa/cocoa.factor
+++ b/extra/ui/cocoa/cocoa.factor
@@ -5,7 +5,7 @@ kernel memory namespaces cocoa.messages cocoa.runtime
cocoa.subclassing cocoa.pasteboard cocoa.types cocoa.windows
cocoa.classes cocoa.application sequences system ui ui.backend
ui.clipboards ui.gadgets ui.gadgets.worlds ui.cocoa.views
-core-foundation ;
+core-foundation threads ;
IN: ui.cocoa
TUPLE: cocoa-ui-backend ;
diff --git a/extra/ui/gadgets/incremental/incremental.factor b/extra/ui/gadgets/incremental/incremental.factor
index a5c7431d36..c90b955eb7 100755
--- a/extra/ui/gadgets/incremental/incremental.factor
+++ b/extra/ui/gadgets/incremental/incremental.factor
@@ -40,13 +40,13 @@ M: incremental pref-dim*
swap set-rect-loc ;
: prefer-incremental ( gadget -- )
- dup forget-pref-dim dup pref-dim over set-rect-dim
- layout ;
+ dup forget-pref-dim dup pref-dim swap set-rect-dim ;
: add-incremental ( gadget incremental -- )
not-in-layout
2dup (add-gadget)
over prefer-incremental
+ over layout-later
2dup incremental-loc
tuck update-cursor
dup prefer-incremental
diff --git a/extra/ui/ui.factor b/extra/ui/ui.factor
index bafd6c40c5..09c06035b8 100755
--- a/extra/ui/ui.factor
+++ b/extra/ui/ui.factor
@@ -4,7 +4,7 @@ USING: arrays assocs io kernel math models namespaces
prettyprint dlists sequences threads sequences words timers
debugger ui.gadgets ui.gadgets.worlds ui.gadgets.tracks
ui.gestures ui.backend ui.render continuations init
-combinators ;
+combinators hashtables ;
IN: ui
! Assoc mapping aliens to gadgets
@@ -114,7 +114,7 @@ SYMBOL: ui-hook
layout-queue [
dup layout find-world [ , ] when*
] dlist-slurp
- ] { } make ;
+ ] { } make prune ;
: redraw-worlds ( seq -- )
[ dup update-hand draw-world ] each ;