steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restoring the "add-" prefix

db4
nicolas-p 2015-07-20 17:55:54 +02:00 committed by John Benediktsson
parent 249bd99400
commit 38447c276a
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
basis/ui/tools/browser/browser.factor
View File

@ -39,7 +39,7 @@ M: browser-gadget set-history-value
CONSTANT: help-header-background COLOR: FactorLightTan CONSTANT: help-header-background COLOR: FactorLightTan
: help-header ( track -- track ) : add-help-header ( track -- track )
dup <help-header> { 3 3 } <border> dup <help-header> { 3 3 } <border>
help-header-background <solid> >>interior help-header-background <solid> >>interior
{ 1 0 } >>fill f track-add ; { 1 0 } >>fill f track-add ;
@ -47,7 +47,7 @@ CONSTANT: help-header-background COLOR: FactorLightTan
: <help-pane> ( browser-gadget -- gadget ) : <help-pane> ( browser-gadget -- gadget )
model>> [ '[ _ print-topic ] try ] <pane-control> ; model>> [ '[ _ print-topic ] try ] <pane-control> ;
: help-pane ( track -- track ) : add-help-pane ( track -- track )
dup dup <help-pane> margins dup dup <help-pane> margins
<scroller> >>scroller scroller>> white-interior 1 track-add ; <scroller> >>scroller scroller>> white-interior 1 track-add ;
@ -68,7 +68,7 @@ CONSTANT: help-header-background COLOR: FactorLightTan
over <toolbar> f track-add over <toolbar> f track-add
swap search-field>> " Search" label-on-left 1 track-add ; swap search-field>> " Search" label-on-left 1 track-add ;
: browser-toolbar ( track -- track ) : add-browser-toolbar ( track -- track )
dup <browser-toolbar> { 3 3 } <border> dup <browser-toolbar> { 3 3 } <border>
toolbar-background <solid> >>interior { 1 0 } >>fill toolbar-background <solid> >>interior { 1 0 } >>fill
f track-add ; f track-add ;
@ -79,9 +79,9 @@ CONSTANT: help-header-background COLOR: FactorLightTan
swap >link <model> >>model swap >link <model> >>model
dup <history> >>history dup <history> >>history
dup <search-field> >>search-field dup <search-field> >>search-field
browser-toolbar add-browser-toolbar
help-header add-help-header
help-pane ; add-help-pane ;
M: browser-gadget graft* M: browser-gadget graft*
[ add-definition-observer ] [ call-next-method ] bi ; [ add-definition-observer ] [ call-next-method ] bi ;

8
basis/ui/tools/listener/listener.factor
View File

@ -218,13 +218,15 @@ TUPLE: listener-gadget < tool error-summary output scroller input ;
<error-summary> >>error-summary <error-summary> >>error-summary
dup error-summary>> f track-add ; dup error-summary>> f track-add ;
: listener-area ( listener -- listener ) : add-listener-area ( listener -- listener )
dup output>> margins <scroller> >>scroller dup output>> margins <scroller> >>scroller
dup scroller>> white-interior 1 track-add ; dup scroller>> white-interior 1 track-add ;
: <listener-gadget> ( -- listener ) : <listener-gadget> ( -- listener )
vertical listener-gadget new-track vertical listener-gadget new-track with-lines
with-lines add-toolbar init-input/output listener-area add-toolbar
init-input/output
add-listener-area
init-error-summary ; init-error-summary ;
M: listener-gadget focusable-child* M: listener-gadget focusable-child*