From 359b42ab15ef09a8a4822e804d152c35032fffdf Mon Sep 17 00:00:00 2001 From: nicolas-p Date: Fri, 24 Jul 2015 16:22:47 +0200 Subject: [PATCH] Removed ui.gadgets.lines with-lines moves to ui.tools.common, white-interior moves to ui.gadgets.colors --- basis/ui/gadgets/colors/colors.factor | 5 +++++ basis/ui/gadgets/lines/lines.factor | 11 ----------- basis/ui/tools/common/common.factor | 4 ++++ 3 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 basis/ui/gadgets/lines/lines.factor diff --git a/basis/ui/gadgets/colors/colors.factor b/basis/ui/gadgets/colors/colors.factor index 175da9f6fd..835e5e3b9e 100644 --- a/basis/ui/gadgets/colors/colors.factor +++ b/basis/ui/gadgets/colors/colors.factor @@ -38,3 +38,8 @@ T{ rgba { red 0.9295 } { green 0.9569 } { blue 0.8510 } { alpha 1.0 } } inline CONSTANT: error-summary-background T{ rgba { red 0.9568 } { green 0.8509 } { blue 0.8509 } { alpha 1.0 } } inline + +CONSTANT: content-background COLOR: white + +: white-interior ( track -- track ) + content-background >>interior ; diff --git a/basis/ui/gadgets/lines/lines.factor b/basis/ui/gadgets/lines/lines.factor deleted file mode 100644 index 0baba808cb..0000000000 --- a/basis/ui/gadgets/lines/lines.factor +++ /dev/null @@ -1,11 +0,0 @@ -! Copyright (C) 2015 Nicolas PĂ©net. -! See http://factorcode.org/license.txt for BSD license. -USING: accessors colors.constants kernel ui.gadgets.colors ui.pens.solid ; -IN: ui.gadgets.lines - -: with-lines ( track -- track ) - dup orientation>> >>gap - line-color >>interior ; - -: white-interior ( track -- track ) - COLOR: white >>interior ; diff --git a/basis/ui/tools/common/common.factor b/basis/ui/tools/common/common.factor index 40ee6352aa..ff566c2451 100644 --- a/basis/ui/tools/common/common.factor +++ b/basis/ui/tools/common/common.factor @@ -41,3 +41,7 @@ SLOT: scroller : margins ( child -- border ) { 9 9 } ; + +: with-lines ( track -- track ) + dup orientation>> >>gap + line-color >>interior ;