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

Simplified toolbar code

db4
nicolas-p 2015-07-25 20:10:26 +02:00 committed by John Benediktsson
parent 2e067a3705
commit 61552d2901
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
basis/ui/gadgets/toolbar/toolbar.factor
View File

@ -29,12 +29,13 @@ PRIVATE>
gesture gesture>tooltip >>tooltip ; inline gesture gesture>tooltip >>tooltip ; inline
: <toolbar> ( target -- toolbar ) : <toolbar> ( target -- toolbar )
<shelf> horizontal <track>
1 >>fill 0 >>fill
1/2 >>align
{ 5 5 } >>gap { 5 5 } >>gap
swap swap
[ [ "toolbar" ] dip class-of get-command-at commands>> ] [ [ "toolbar" ] dip class-of get-command-at commands>> ]
[ '[ [ _ ] 2dip <toolbar-button> add-gadget ] ] [ '[ [ _ ] 2dip <toolbar-button> f track-add ] ]
bi assoc-each ; bi assoc-each ;
: format-toolbar ( toolbar -- toolbar ) : format-toolbar ( toolbar -- toolbar )

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

@ -75,16 +75,10 @@ M: browser-gadget set-history-value
white-interior ; white-interior ;
: add-spacer ( track -- track ) : add-spacer ( track -- track )
<pile> { 10 0 } <border> f track-add ; <pile> 1/4 track-add ;
: <browser-toolbar> ( browser -- toolbar ) : <browser-toolbar> ( browser -- toolbar )
horizontal <track> [ <toolbar> add-spacer ] [ search-field>> "Search" label-on-left 1 track-add ] bi ;
0 >>fill
1/2 >>align
{ 5 5 } >>gap
over <toolbar> f track-add
add-spacer
swap search-field>> "Search" label-on-left 1 track-add ;
: add-browser-toolbar ( track -- track ) : add-browser-toolbar ( track -- track )
dup <browser-toolbar> format-toolbar f track-add ; dup <browser-toolbar> format-toolbar f track-add ;

4
basis/ui/tools/error-list/error-list.factor
View File

@ -149,7 +149,7 @@ error-display "toolbar" f {
} define-command-map } define-command-map
: <error-list-toolbar> ( error-list -- toolbar ) : <error-list-toolbar> ( error-list -- toolbar )
[ <toolbar> ] [ error-toggle>> "Show errors:" label-on-left add-gadget ] bi [ <toolbar> ] [ error-toggle>> "Show errors:" label-on-left f track-add ] bi
format-toolbar ; format-toolbar ;
: <error-model> ( visible-errors model -- model' ) : <error-model> ( visible-errors model -- model' )
@ -173,7 +173,7 @@ error-display "toolbar" f {
"Errors" errors-color <labeled> 1/4 track-add "Errors" errors-color <labeled> 1/4 track-add
error-list error-display>> error-list error-display>>
"Details" details-color <labeled> 1/2 track-add "Details" details-color <labeled> 1/2 track-add
1 track-add ; 1 track-add ;
M: error-list-gadget focusable-child* M: error-list-gadget focusable-child*
source-file-table>> ; source-file-table>> ;