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

Toolbar, lines and margins used in listener and browser

db4
nicolas-p 2015-07-19 22:32:21 +02:00 committed by John Benediktsson
parent 265a855217
commit 249bd99400
2 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,18 +39,17 @@ M: browser-gadget set-history-value
CONSTANT: help-header-background COLOR: FactorLightTan CONSTANT: help-header-background COLOR: FactorLightTan
: add-help-header ( track -- track ) : 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
toolbar-border <solid-underlined> >>boundary
{ 1 0 } >>fill f track-add ; { 1 0 } >>fill f track-add ;
: <help-pane> ( browser-gadget -- gadget ) : <help-pane> ( browser-gadget -- gadget )
model>> [ '[ _ print-topic ] try ] <pane-control> ; model>> [ '[ _ print-topic ] try ] <pane-control> ;
: add-help-pane ( track -- track ) : help-pane ( track -- track )
dup dup <help-pane> { 10 0 } <border> { 1 1 } >>fill dup dup <help-pane> margins
<scroller> >>scroller scroller>> 1 track-add ; <scroller> >>scroller scroller>> white-interior 1 track-add ;
: search-browser ( string browser -- ) : search-browser ( string browser -- )
'[ <apropos-search> _ show-help ] unless-empty ; '[ <apropos-search> _ show-help ] unless-empty ;
@ -59,7 +58,7 @@ CONSTANT: help-header-background COLOR: FactorLightTan
'[ _ search-browser ] <action-field> '[ _ search-browser ] <action-field>
10 >>min-cols 10 >>min-cols
10 >>max-cols 10 >>max-cols
COLOR: white <solid> >>interior ; white-interior ;
: <browser-toolbar> ( browser -- toolbar ) : <browser-toolbar> ( browser -- toolbar )
horizontal <track> horizontal <track>
@ -69,21 +68,20 @@ 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 ;
: add-browser-toolbar ( track -- track ) : browser-toolbar ( track -- track )
dup <browser-toolbar> { 3 3 } <border> dup <browser-toolbar> { 3 3 } <border>
button-background <solid> >>interior toolbar-background <solid> >>interior { 1 0 } >>fill
toolbar-border <solid-underlined> >>boundary f track-add ;
{ 1 0 } >>fill f track-add ;
: <browser-gadget> ( link -- gadget ) : <browser-gadget> ( link -- gadget )
vertical browser-gadget new-track vertical browser-gadget new-track with-lines
1 >>fill 1 >>fill
swap >link <model> >>model swap >link <model> >>model
dup <history> >>history dup <history> >>history
dup <search-field> >>search-field dup <search-field> >>search-field
add-browser-toolbar browser-toolbar
add-help-header help-header
add-help-pane ; help-pane ;
M: browser-gadget graft* M: browser-gadget graft*
[ add-definition-observer ] [ call-next-method ] bi ; [ add-definition-observer ] [ call-next-method ] bi ;

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

@ -8,9 +8,10 @@ io.styles kernel lexer listener locals make math models
models.arrow models.delay namespaces parser prettyprint models.arrow models.delay namespaces parser prettyprint
quotations sequences source-files.errors strings system threads quotations sequences source-files.errors strings system threads
tools.errors.model ui ui.commands ui.gadgets ui.gadgets.buttons tools.errors.model ui ui.commands ui.gadgets ui.gadgets.buttons
ui.gadgets.editors ui.gadgets.glass ui.gadgets.labeled ui.gadgets.editors ui.gadgets.glass ui.gadgets.labeled ui.gadgets.lines
ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar
ui.gadgets.tracks ui.gestures ui.operations ui.pens.solid ui.gadgets.tracks ui.gadgets.toolbar
ui.gestures ui.operations ui.pens.solid
ui.tools.browser ui.tools.common ui.tools.debugger ui.tools.browser ui.tools.common ui.tools.debugger
ui.tools.error-list ui.tools.listener.completion ui.tools.error-list ui.tools.listener.completion
ui.tools.listener.history ui.tools.listener.popups vocabs ui.tools.listener.history ui.tools.listener.popups vocabs
@ -217,14 +218,13 @@ 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 )
dup output>> margins <scroller> >>scroller
dup scroller>> white-interior 1 track-add ;
: <listener-gadget> ( -- listener ) : <listener-gadget> ( -- listener )
vertical listener-gadget new-track vertical listener-gadget new-track
add-toolbar with-lines add-toolbar init-input/output listener-area
init-input/output
dup output>>
{ 7 7 } <border> { 1 1 } >>fill
<scroller> >>scroller
dup scroller>> 1 track-add
init-error-summary ; init-error-summary ;
M: listener-gadget focusable-child* M: listener-gadget focusable-child*