From f4948ec9701cdda02a28e5ad6620db96666026ba Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 25 Mar 2009 22:52:52 -0500 Subject: [PATCH] Merge tools.test.ui into ui.gadgets.debug --- basis/tools/test/ui/authors.txt | 1 - basis/tools/test/ui/ui.factor | 16 ---------------- basis/ui/gadgets/debug/debug.factor | 16 +++++++++++++++- basis/ui/gadgets/editors/editors-tests.factor | 2 +- basis/ui/gadgets/panes/panes-tests.factor | 2 +- .../ui/gadgets/scrollers/scrollers-tests.factor | 2 +- basis/ui/tools/browser/browser-tests.factor | 2 +- basis/ui/tools/listener/listener-tests.factor | 2 +- 8 files changed, 20 insertions(+), 23 deletions(-) delete mode 100755 basis/tools/test/ui/authors.txt delete mode 100644 basis/tools/test/ui/ui.factor diff --git a/basis/tools/test/ui/authors.txt b/basis/tools/test/ui/authors.txt deleted file mode 100755 index 1901f27a24..0000000000 --- a/basis/tools/test/ui/authors.txt +++ /dev/null @@ -1 +0,0 @@ -Slava Pestov diff --git a/basis/tools/test/ui/ui.factor b/basis/tools/test/ui/ui.factor deleted file mode 100644 index c37e7799cb..0000000000 --- a/basis/tools/test/ui/ui.factor +++ /dev/null @@ -1,16 +0,0 @@ -USING: dlists ui.gadgets ui.gadgets.private -kernel ui namespaces io.streams.string io ; -IN: tools.test.ui - -! We can't print to output-stream here because that might be a pane -! stream, and our graft-queue rebinding here would be captured -! by code adding children to the pane... -: with-grafted-gadget ( gadget quot -- ) - [ - \ graft-queue [ - over - graft notify-queued - dip - ungraft notify-queued - ] with-variable - ] with-string-writer print ; diff --git a/basis/ui/gadgets/debug/debug.factor b/basis/ui/gadgets/debug/debug.factor index 076c772f97..f8d496c1fc 100644 --- a/basis/ui/gadgets/debug/debug.factor +++ b/basis/ui/gadgets/debug/debug.factor @@ -2,9 +2,23 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays colors.constants combinators kernel opengl sequences ui ui.baseline-alignment ui.gadgets -ui.gadgets.buttons ui.gadgets.labels ui.pens ui.render ui.text ; +ui.gadgets.buttons ui.gadgets.labels ui.pens ui.render ui.text +ui.gadgets.private dlists namespaces io.streams.string io ; IN: ui.gadgets.debug +! We can't print to output-stream here because that might be a pane +! stream, and our graft-queue rebinding here would be captured +! by code adding children to the pane... +: with-grafted-gadget ( gadget quot -- ) + [ + \ graft-queue set + \ layout-queue set + over + graft notify-queued + dip + ungraft notify-queued + ] with-string-writer print ; inline + TUPLE: baseline-gadget < gadget baseline cap-height ; M: baseline-gadget baseline baseline>> ; diff --git a/basis/ui/gadgets/editors/editors-tests.factor b/basis/ui/gadgets/editors/editors-tests.factor index f8dc5b91c9..bd610ba53b 100644 --- a/basis/ui/gadgets/editors/editors-tests.factor +++ b/basis/ui/gadgets/editors/editors-tests.factor @@ -1,6 +1,6 @@ USING: accessors ui.gadgets.editors tools.test kernel io io.streams.plain definitions namespaces ui.gadgets -ui.gadgets.grids prettyprint documents ui.gestures tools.test.ui +ui.gadgets.grids prettyprint documents ui.gestures ui.gadgets.debug models documents.elements ui.gadgets.scrollers ui.gadgets.line-support sequences ; IN: ui.gadgets.editors.tests diff --git a/basis/ui/gadgets/panes/panes-tests.factor b/basis/ui/gadgets/panes/panes-tests.factor index 0c47af0214..0529437a76 100644 --- a/basis/ui/gadgets/panes/panes-tests.factor +++ b/basis/ui/gadgets/panes/panes-tests.factor @@ -1,7 +1,7 @@ USING: alien ui.gadgets.panes ui.gadgets namespaces kernel sequences io io.styles io.streams.string tools.test prettyprint definitions help help.syntax help.markup -help.stylesheet splitting tools.test.ui models math summary +help.stylesheet splitting ui.gadgets.debug models math summary inspector accessors help.topics see ; IN: ui.gadgets.panes.tests diff --git a/basis/ui/gadgets/scrollers/scrollers-tests.factor b/basis/ui/gadgets/scrollers/scrollers-tests.factor index 4e61c9b1ed..d4cdc95daf 100644 --- a/basis/ui/gadgets/scrollers/scrollers-tests.factor +++ b/basis/ui/gadgets/scrollers/scrollers-tests.factor @@ -1,7 +1,7 @@ USING: ui.gadgets ui.gadgets.scrollers namespaces tools.test kernel models models.product models.range ui.gadgets.viewports ui.gadgets.labels ui.gadgets.grids ui.gadgets.sliders math -math.vectors arrays sequences tools.test.ui math.rectangles +math.vectors arrays sequences ui.gadgets.debug math.rectangles accessors ui.gadgets.buttons ui.gadgets.packs ui.gadgets.scrollers.private ; IN: ui.gadgets.scrollers.tests diff --git a/basis/ui/tools/browser/browser-tests.factor b/basis/ui/tools/browser/browser-tests.factor index 7477edbe6a..3757f392c4 100644 --- a/basis/ui/tools/browser/browser-tests.factor +++ b/basis/ui/tools/browser/browser-tests.factor @@ -1,5 +1,5 @@ IN: ui.tools.browser.tests -USING: tools.test tools.test.ui ui.tools.browser math ; +USING: tools.test ui.gadgets.debug ui.tools.browser math ; \ must-infer [ ] [ \ + [ ] with-grafted-gadget ] unit-test diff --git a/basis/ui/tools/listener/listener-tests.factor b/basis/ui/tools/listener/listener-tests.factor index 63df55b71a..986e1270eb 100644 --- a/basis/ui/tools/listener/listener-tests.factor +++ b/basis/ui/tools/listener/listener-tests.factor @@ -1,7 +1,7 @@ USING: continuations documents ui.tools.listener hashtables kernel namespaces parser sequences tools.test ui.commands ui.gadgets ui.gadgets.editors -ui.gadgets.panes vocabs words tools.test.ui slots.private +ui.gadgets.panes vocabs words ui.gadgets.debug slots.private threads arrays generic threads accessors listener math calendar concurrency.promises io ui.tools.common ; IN: ui.tools.listener.tests