From cb575c1ba86d07e6dd40788c9081fba01501f8ce Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sun, 16 Aug 2015 08:04:58 -0700 Subject: [PATCH] ui.gadgets.labeled: separate title-bar-interior with a comment why. --- basis/ui/gadgets/labeled/labeled.factor | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/basis/ui/gadgets/labeled/labeled.factor b/basis/ui/gadgets/labeled/labeled.factor index deb1546ec0..a943ca860d 100644 --- a/basis/ui/gadgets/labeled/labeled.factor +++ b/basis/ui/gadgets/labeled/labeled.factor @@ -13,14 +13,18 @@ TUPLE: labeled-gadget < track content color ; M: labeled-gadget focusable-child* content>> ; +! gradients don't work as backgrounds on windows, see #152 and #1397 +: title-bar-interior ( -- interior ) + os windows? + [ toolbar-background ] + [ title-bar-gradient ] + if ; + : add-title-bar ( title track -- track ) swap >label [ t >>bold? ] change-font { 0 4 } - os windows = - [ toolbar-background ] - [ title-bar-gradient ] - if >>interior + title-bar-interior >>interior f track-add ; : add-content ( content track -- track ) @@ -28,7 +32,7 @@ M: labeled-gadget focusable-child* content>> ; : add-color-line ( color track -- track ) { 0 1.5 } - rot >>interior + rot >>interior f track-add ; : add-content-area ( labeled -- labeled ) @@ -53,8 +57,8 @@ PRIVATE> : ( gadget title -- labeled ) vertical labeled-gadget new-track with-lines add-title-bar - swap >>content dup content>> - vertical + swap [ >>content ] keep + vertical add-content { 5 5 } content-background >>interior