Merge branch 'master' of git://factorcode.org/git/factor
commit
07cec22503
|
@ -94,4 +94,4 @@ MACRO: bake ( seq -- quot ) [bake] ;
|
||||||
|
|
||||||
: `{ \ } [ >array ] parse-literal \ bake parsed ; parsing
|
: `{ \ } [ >array ] parse-literal \ bake parsed ; parsing
|
||||||
: `V{ \ } [ >vector ] parse-literal \ bake parsed ; parsing
|
: `V{ \ } [ >vector ] parse-literal \ bake parsed ; parsing
|
||||||
: `[ \ } [ >quotation ] parse-literal \ bake parsed ; parsing
|
: `[ \ ] [ >quotation ] parse-literal \ bake parsed ; parsing
|
|
@ -5,10 +5,8 @@ kernel namespaces tools.test math.parser sequences math.geometry.rect ;
|
||||||
[ t ] [
|
[ t ] [
|
||||||
{ 0 0 } { 100 100 } <rect> clip set
|
{ 0 0 } { 100 100 } <rect> clip set
|
||||||
|
|
||||||
[
|
<pile>
|
||||||
100 [ number>string <label> gadget, ] each
|
100 [ number>string <label> add-gadget ] each
|
||||||
] make-pile
|
|
||||||
|
|
||||||
dup layout
|
dup layout
|
||||||
|
|
||||||
visible-children [ label? ] all?
|
visible-children [ label? ] all?
|
||||||
|
|
|
@ -16,12 +16,11 @@ TUPLE: inspector-gadget < track object pane ;
|
||||||
] with-pane ;
|
] with-pane ;
|
||||||
|
|
||||||
: <inspector-gadget> ( -- gadget )
|
: <inspector-gadget> ( -- gadget )
|
||||||
{ 0 1 } inspector-gadget new-track
|
{ 0 1 } inspector-gadget new-track
|
||||||
[
|
dup <toolbar> f track-add*
|
||||||
toolbar,
|
<pane> >>pane
|
||||||
<pane> g-> set-inspector-gadget-pane <scroller> 1 track,
|
dup pane>> <scroller> 1 track-add* ;
|
||||||
] make-gadget ;
|
|
||||||
|
|
||||||
: inspect-object ( obj mirror keys inspector -- )
|
: inspect-object ( obj mirror keys inspector -- )
|
||||||
2nip swap >>object refresh ;
|
2nip swap >>object refresh ;
|
||||||
|
|
||||||
|
|
|
@ -120,14 +120,13 @@ M: engine-word word-completion-string
|
||||||
|
|
||||||
TUPLE: stack-display < track ;
|
TUPLE: stack-display < track ;
|
||||||
|
|
||||||
: <stack-display> ( -- gadget )
|
: <stack-display> ( workspace -- gadget )
|
||||||
g workspace-listener
|
listener>>
|
||||||
{ 0 1 } stack-display new-track
|
{ 0 1 } stack-display new-track
|
||||||
[
|
over <toolbar> f track-add*
|
||||||
dup <toolbar> f track,
|
swap
|
||||||
stack>> [ [ stack. ] curry try ]
|
stack>> [ [ stack. ] curry try ] t "Data stack" <labelled-pane>
|
||||||
t "Data stack" <labelled-pane> 1 track,
|
1 track-add* ;
|
||||||
] make-gadget ;
|
|
||||||
|
|
||||||
M: stack-display tool-scroller
|
M: stack-display tool-scroller
|
||||||
find-workspace workspace-listener tool-scroller ;
|
find-workspace workspace-listener tool-scroller ;
|
||||||
|
|
|
@ -2,19 +2,17 @@
|
||||||
! See http://factorcode.org/license.txt for BSD license.
|
! See http://factorcode.org/license.txt for BSD license.
|
||||||
USING: ui.tools.workspace kernel quotations tools.profiler
|
USING: ui.tools.workspace kernel quotations tools.profiler
|
||||||
ui.commands ui.gadgets ui.gadgets.panes ui.gadgets.scrollers
|
ui.commands ui.gadgets ui.gadgets.panes ui.gadgets.scrollers
|
||||||
ui.gadgets.tracks ui.gestures ui.gadgets.buttons ;
|
ui.gadgets.tracks ui.gestures ui.gadgets.buttons accessors ;
|
||||||
IN: ui.tools.profiler
|
IN: ui.tools.profiler
|
||||||
|
|
||||||
TUPLE: profiler-gadget < track pane ;
|
TUPLE: profiler-gadget < track pane ;
|
||||||
|
|
||||||
: <profiler-gadget> ( -- gadget )
|
: <profiler-gadget> ( -- gadget )
|
||||||
{ 0 1 } profiler-gadget new-track
|
{ 0 1 } profiler-gadget new-track
|
||||||
[
|
dup <toolbar> f track-add*
|
||||||
toolbar,
|
<pane> >>pane
|
||||||
<pane> g-> set-profiler-gadget-pane
|
dup pane>> <scroller> 1 track-add* ;
|
||||||
<scroller> 1 track,
|
|
||||||
] make-gadget ;
|
|
||||||
|
|
||||||
: with-profiler-pane ( gadget quot -- )
|
: with-profiler-pane ( gadget quot -- )
|
||||||
>r profiler-gadget-pane r> with-pane ;
|
>r profiler-gadget-pane r> with-pane ;
|
||||||
|
|
||||||
|
|
|
@ -12,31 +12,36 @@ tools.test tools.vocabs ui.gadgets.buttons ui.gadgets.status-bar
|
||||||
mirrors ;
|
mirrors ;
|
||||||
IN: ui.tools
|
IN: ui.tools
|
||||||
|
|
||||||
: <workspace-tabs> ( -- tabs )
|
: <workspace-tabs> ( workspace -- tabs )
|
||||||
g gadget-model
|
model>>
|
||||||
"tool-switching" workspace command-map commands>>
|
"tool-switching" workspace command-map commands>>
|
||||||
[ command-string ] { } assoc>map <enum> >alist
|
[ command-string ] { } assoc>map <enum> >alist
|
||||||
<toggle-buttons> ;
|
<toggle-buttons> ;
|
||||||
|
|
||||||
: <workspace-book> ( -- gadget )
|
: <workspace-book> ( workspace -- gadget )
|
||||||
[
|
|
||||||
<stack-display> ,
|
|
||||||
<browser-gadget> ,
|
|
||||||
<inspector-gadget> ,
|
|
||||||
<profiler-gadget> ,
|
|
||||||
] { } make g gadget-model <book> ;
|
|
||||||
|
|
||||||
|
dup
|
||||||
|
<stack-display>
|
||||||
|
<browser-gadget>
|
||||||
|
<inspector-gadget>
|
||||||
|
<profiler-gadget>
|
||||||
|
4array
|
||||||
|
|
||||||
|
swap model>>
|
||||||
|
|
||||||
|
<book> ;
|
||||||
|
|
||||||
: <workspace> ( -- workspace )
|
: <workspace> ( -- workspace )
|
||||||
{ 0 1 } workspace new-track
|
{ 0 1 } workspace new-track
|
||||||
0 <model> >>model
|
|
||||||
[
|
0 <model> >>model
|
||||||
<listener-gadget> g set-workspace-listener
|
<listener-gadget> >>listener
|
||||||
<workspace-book> g set-workspace-book
|
dup <workspace-book> >>book
|
||||||
<workspace-tabs> f track,
|
|
||||||
g workspace-book 1/5 track,
|
dup <workspace-tabs> f track-add*
|
||||||
g workspace-listener 4/5 track,
|
dup book>> 1/5 track-add*
|
||||||
toolbar,
|
dup listener>> 4/5 track-add*
|
||||||
] make-gadget ;
|
dup <toolbar> f track-add* ;
|
||||||
|
|
||||||
: resize-workspace ( workspace -- )
|
: resize-workspace ( workspace -- )
|
||||||
dup track-sizes over control-value zero? [
|
dup track-sizes over control-value zero? [
|
||||||
|
|
Loading…
Reference in New Issue