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

ui.gadgets.labels: respect the labels background and foreground.

db4
John Benediktsson 2015-07-25 22:38:34 -07:00
parent b9c0255fcc
commit 5fbe6aa9e6
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
basis/ui/gadgets/labels/labels.factor
View File

@ -1,6 +1,6 @@
! Copyright (C) 2005, 2009 Slava Pestov. ! Copyright (C) 2005, 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays colors.constants combinators fonts USING: accessors arrays colors.constants combinators fonts fry
kernel make math.functions models namespaces sequences splitting kernel make math.functions models namespaces sequences splitting
strings ui.baseline-alignment ui.gadgets ui.gadgets.tracks strings ui.baseline-alignment ui.gadgets ui.gadgets.tracks
ui.pens.solid ui.render ui.text ; ui.pens.solid ui.render ui.text ;
@ -64,13 +64,21 @@ M: label baseline*
M: label cap-height* M: label cap-height*
label-metrics cap-height>> round ; label-metrics cap-height>> round ;
<PRIVATE
: label-background ( label -- color )
gadget-background background get or ; inline
: label-foreground ( label -- color )
gadget-foreground foreground get or ; inline
PRIVATE>
M: label draw-gadget* M: label draw-gadget*
>label< [ >label< ] keep
[ [ label-background [ font-with-background ] when* ]
background get [ font-with-background ] when* [ label-foreground [ font-with-foreground ] when* ]
foreground get [ font-with-foreground ] when* bi-curry compose dip draw-text ;
] dip
draw-text ;
M: label gadget-text* string>> % ; M: label gadget-text* string>> % ;