ui.gadgets.labeled: make <labeled-gadget> not take a color.
This allows backwards compatibility with 0.97 API. Adding <colored-labeled-gadget> for a version with a colored divider and implementing it with a gap between title bar and content intead of a shelf border gadget.factor-shell
John Benediktsson
parent
2a45023e2f
commit
9c22098dec
|
|
@ -1,19 +1,28 @@
|
|||
USING: ui.gadgets help.markup help.syntax strings models
|
||||
ui.gadgets.panes ;
|
||||
ui.gadgets.panes ui.theme ;
|
||||
IN: ui.gadgets.labeled
|
||||
|
||||
HELP: labeled-gadget
|
||||
{ $class-description "A labeled gadget can be created by calling " { $link <labeled-gadget> } "." } ;
|
||||
|
||||
HELP: <labeled-gadget>
|
||||
{ $values { "gadget" gadget } { "title" string } { "color" "a color" } { "labeled" "a new " { $link <labeled-gadget> } } }
|
||||
{ $description "Creates a new " { $link labeled-gadget } " display " { $snippet "gadget" } " with " { $snippet "title" } " on top." } ;
|
||||
{ $values { "content" gadget } { "title" string } { "labeled" labeled-gadget } }
|
||||
{ $description "Creates a new " { $link labeled-gadget } " displaying " { $snippet "content" } " with " { $snippet "title" } " on top." } ;
|
||||
|
||||
HELP: <colored-labeled-gadget>
|
||||
{ $values { "content" gadget } { "title" string } { "color" "a color" } { "labeled" labeled-gadget } }
|
||||
{ $description "Creates a new " { $link labeled-gadget } " displaying " { $snippet "content" } " with " { $snippet "title" } " on top, adding a " { $snippet "color" } " colored divider between title bar and content." } ;
|
||||
|
||||
HELP: <framed-labeled-gadget>
|
||||
{ $values { "content" gadget } { "title" string } { "color" "a color" } { "labeled" labeled-gadget } }
|
||||
{ $description "Creates a new " { $link labeled-gadget } " displaying " { $snippet "content" } " with " { $snippet "title" } " on top, adding a " { $snippet "color" } " colored divider between title bar and content and a " { $link labeled-border-color } " frame." } ;
|
||||
|
||||
ARTICLE: "ui.gadgets.labeled" "Labeled gadgets"
|
||||
"The " { $vocab-link "ui.gadgets.labeled" } " vocabulary implements labeled borders around child gadgets."
|
||||
{ $subsections
|
||||
labeled-gadget
|
||||
<labeled-gadget>
|
||||
<colored-labeled-gadget>
|
||||
<framed-labeled-gadget>
|
||||
} ;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,5 @@ ui.gadgets ui.gadgets.labeled ;
|
|||
IN: ui.gadgets.labeled.tests
|
||||
|
||||
{ t } [
|
||||
<gadget> "Hey" COLOR: blue <labeled-gadget>
|
||||
content>> gadget?
|
||||
<gadget> "Hey" <labeled-gadget> content>> gadget?
|
||||
] unit-test
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ ui.gadgets.labels ui.gadgets.packs ui.gadgets.tracks
|
|||
ui.pens.gradient ui.pens.solid ui.theme ;
|
||||
IN: ui.gadgets.labeled
|
||||
|
||||
TUPLE: labeled-gadget < track content color ;
|
||||
TUPLE: labeled-gadget < track content ;
|
||||
|
||||
<PRIVATE
|
||||
|
||||
|
|
@ -18,36 +18,19 @@ M: labeled-gadget focusable-child* content>> ;
|
|||
[ title-bar-gradient <gradient> ]
|
||||
if ;
|
||||
|
||||
: add-title-bar ( title track -- track )
|
||||
swap >label
|
||||
[ t >>bold? ] change-font
|
||||
{ 0 4 } <border>
|
||||
title-bar-interior >>interior
|
||||
f track-add ;
|
||||
|
||||
: add-content ( content track -- track )
|
||||
swap 1 track-add ;
|
||||
|
||||
: add-color-line ( color track -- track )
|
||||
<shelf> { 0 1.5 } <border>
|
||||
rot <solid> >>interior
|
||||
f track-add ;
|
||||
|
||||
: add-content-area ( labeled -- labeled )
|
||||
[ ] [ content>> ] [ color>> ] tri
|
||||
vertical <track>
|
||||
add-color-line
|
||||
add-content
|
||||
1 track-add ;
|
||||
: <title-bar> ( title -- title-bar )
|
||||
>label [ t >>bold? ] change-font
|
||||
{ 0 4 } <border> title-bar-interior >>interior ;
|
||||
|
||||
PRIVATE>
|
||||
|
||||
: <labeled-gadget> ( gadget title color -- labeled )
|
||||
: <labeled-gadget> ( content title -- labeled )
|
||||
vertical labeled-gadget new-track
|
||||
swap >>color
|
||||
add-title-bar
|
||||
swap >>content
|
||||
add-content-area ;
|
||||
swap <title-bar> f track-add
|
||||
swap [ >>content ] [ 1 track-add ] bi ;
|
||||
|
||||
: <framed-labeled-gadget> ( gadget title color -- labeled )
|
||||
<labeled-gadget> labeled-border-color <solid> >>boundary ;
|
||||
: <colored-labeled-gadget> ( content title color -- labeled )
|
||||
[ <labeled-gadget> ] dip <solid> >>interior { 0 3 } >>gap ;
|
||||
|
||||
: <framed-labeled-gadget> ( content title color -- labeled )
|
||||
<colored-labeled-gadget> labeled-border-color <solid> >>boundary ;
|
||||
|
|
|
|||
|
|
@ -168,11 +168,11 @@ error-display "toolbar" f {
|
|||
error-list vertical <track> with-lines
|
||||
error-list <error-list-toolbar> f track-add
|
||||
error-list source-file-table>> margins <scroller> white-interior
|
||||
"Source files" source-files-color <labeled-gadget> 1/4 track-add
|
||||
"Source files" source-files-color <colored-labeled-gadget> 1/4 track-add
|
||||
error-list error-table>> margins <scroller> white-interior
|
||||
"Errors" errors-color <labeled-gadget> 1/4 track-add
|
||||
"Errors" errors-color <colored-labeled-gadget> 1/4 track-add
|
||||
error-list error-display>>
|
||||
"Details" details-color <labeled-gadget> 1/2 track-add
|
||||
"Details" details-color <colored-labeled-gadget> 1/2 track-add
|
||||
1 track-add ;
|
||||
|
||||
M: error-list-gadget focusable-child*
|
||||
|
|
|
|||
|
|
@ -101,9 +101,9 @@ M: inspector-table compute-column-widths
|
|||
swap >>model
|
||||
dup model>> <inspector-table> >>table
|
||||
dup model>> <summary-gadget> margins white-interior
|
||||
"Object" object-color <labeled-gadget> f track-add
|
||||
"Object" object-color <colored-labeled-gadget> f track-add
|
||||
dup table>> <scroller> margins white-interior
|
||||
"Contents" contents-color <labeled-gadget> 1 track-add ;
|
||||
"Contents" contents-color <colored-labeled-gadget> 1 track-add ;
|
||||
|
||||
M: inspector-gadget focusable-child*
|
||||
table>> ;
|
||||
|
|
|
|||
|
|
@ -33,12 +33,12 @@ M: stack-entry-renderer row-value drop object>> ;
|
|||
|
||||
: <stack-display> ( model quot title color -- gadget )
|
||||
[ '[ dup _ when ] <arrow> <stack-table> margins <scroller> white-interior ] 2dip
|
||||
<labeled-gadget> ;
|
||||
<colored-labeled-gadget> ;
|
||||
|
||||
: <callstack-display> ( model -- gadget )
|
||||
[ [ call>> callstack. ] when* ]
|
||||
<pane-control> t >>scrolls? margins <scroller> white-interior
|
||||
"Call stack" call-stack-color <labeled-gadget> ;
|
||||
"Call stack" call-stack-color <colored-labeled-gadget> ;
|
||||
|
||||
: <datastack-display> ( model -- gadget )
|
||||
[ data>> ] "Data stack" data-stack-color <stack-display> ;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ M: stack-entry-renderer row-value
|
|||
|
||||
: <stack-display> ( model -- gadget )
|
||||
<stack-table> <scroller> "Operand stack"
|
||||
COLOR: dark-gray <labeled-gadget> ;
|
||||
COLOR: dark-gray <colored-labeled-gadget> ;
|
||||
|
||||
TUPLE: gml-editor < frame editor gml stack-model b-rep b-rep-model ;
|
||||
|
||||
|
|
@ -99,7 +99,7 @@ CONSTANT: example-dir "vocab:gml/examples/"
|
|||
30 >>max-rows
|
||||
40 >>min-cols
|
||||
40 >>max-cols
|
||||
<scroller> "Editor" COLOR: dark-gray <labeled-gadget> ;
|
||||
<scroller> "Editor" COLOR: dark-gray <colored-labeled-gadget> ;
|
||||
|
||||
: <gml-editor> ( -- gadget )
|
||||
2 3 gml-editor new-frame
|
||||
|
|
|
|||
|
|
@ -19,8 +19,7 @@ MAIN-WINDOW: merger-window {
|
|||
[ swap set-control-value ] 2bi
|
||||
] [ drop ] if*
|
||||
] <border-button> swap >>model swap
|
||||
COLOR: black <labeled-gadget>
|
||||
1 track-add
|
||||
<labeled-gadget> 1 track-add
|
||||
] 2each
|
||||
] keep
|
||||
dup first2
|
||||
|
|
|
|||
Loading…
Reference in New Issue