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

Other small adjustment in browser toolbar

db4
nicolas-p 2015-07-25 16:31:49 +02:00 committed by John Benediktsson
parent 32ae5da655
commit 883d7e09d9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,14 +12,14 @@ IN: ui.gadgets.toolbar
toolbar-background <solid> dup toolbar-background <solid> dup
line-color <solid> dup dup line-color <solid> dup dup
<button-pen> ; <button-pen> ;
: toolbar-button-theme ( gadget -- gadget ) : toolbar-button-theme ( gadget -- gadget )
dup gadget-child border-button-label-theme dup gadget-child border-button-label-theme
horizontal >>orientation horizontal >>orientation
<toolbar-button-pen> >>interior <toolbar-button-pen> >>interior
dup dup interior>> pen-pref-dim >>min-dim dup dup interior>> pen-pref-dim >>min-dim
{ 10 6 } >>size ; inline { 10 6 } >>size ; inline
PRIVATE> PRIVATE>
:: <toolbar-button> ( target gesture command -- button ) :: <toolbar-button> ( target gesture command -- button )
@ -36,9 +36,9 @@ PRIVATE>
[ [ "toolbar" ] dip class-of get-command-at commands>> ] [ [ "toolbar" ] dip class-of get-command-at commands>> ]
[ '[ [ _ ] 2dip <toolbar-button> add-gadget ] ] [ '[ [ _ ] 2dip <toolbar-button> add-gadget ] ]
bi assoc-each ; bi assoc-each ;
: format-toolbar ( toolbar -- toolbar ) : format-toolbar ( toolbar -- toolbar )
{ 0 0 } <border> { 5 0 } <border>
toolbar-background <solid> >>interior toolbar-background <solid> >>interior
{ 1 0 } >>fill ; { 1 0 } >>fill ;

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

@ -74,15 +74,17 @@ M: browser-gadget set-history-value
10 >>max-cols 10 >>max-cols
white-interior ; white-interior ;
: add-spacer ( track -- track )
<pile> { 10 0 } <border> f track-add ;
: <browser-toolbar> ( browser -- toolbar ) : <browser-toolbar> ( browser -- toolbar )
horizontal <track> horizontal <track>
0 >>fill 0 >>fill
1/2 >>align 1/2 >>align
{ 5 5 } >>gap { 5 5 } >>gap
over <toolbar> f track-add over <toolbar> f track-add
<pile> { 10 0 } <border> f track-add add-spacer
swap search-field>> "Search" label-on-left 1 track-add swap search-field>> "Search" label-on-left 1 track-add ;
<pile> f 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 ;