From d0b4f7d9a3c77cea5e39d002f89fe3fa071ff168 Mon Sep 17 00:00:00 2001 From: nicolas-p Date: Thu, 23 Jul 2015 19:24:25 +0200 Subject: [PATCH] Using ui.gadgets.colors everywhere --- basis/ui/gadgets/labeled/labeled.factor | 4 +--- basis/ui/gadgets/lines/lines.factor | 8 +------- basis/ui/gadgets/menus/menus.factor | 7 ++----- basis/ui/gadgets/status-bar/status-bar.factor | 5 +---- basis/ui/gadgets/toolbar/toolbar.factor | 13 +++++++------ basis/ui/tools/browser/browser.factor | 5 +---- basis/ui/tools/browser/popups/popups.factor | 4 ++-- basis/ui/tools/inspector/inspector.factor | 9 +-------- basis/ui/tools/listener/listener.factor | 10 ++-------- basis/ui/tools/traceback/traceback.factor | 6 +----- basis/ui/tools/walker/walker.factor | 7 ++----- 11 files changed, 21 insertions(+), 57 deletions(-) diff --git a/basis/ui/gadgets/labeled/labeled.factor b/basis/ui/gadgets/labeled/labeled.factor index fb651210a9..e872144c47 100644 --- a/basis/ui/gadgets/labeled/labeled.factor +++ b/basis/ui/gadgets/labeled/labeled.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2006, 2009 Slava Pestov, 2015 Nicolas Pénet. ! See http://factorcode.org/license.txt for BSD license. USING: accessors colors.constants fonts kernel ui.gadgets -ui.gadgets.borders ui.gadgets.corners ui.gadgets.frames +ui.gadgets.borders ui.gadgets.colors ui.gadgets.corners ui.gadgets.frames ui.gadgets.grids ui.gadgets.labels ui.gadgets.lines ui.gadgets.tracks ui.gadgets.packs ui.tools.common ui.pens.gradient ui.pens.image ui.pens.solid ui.render ; @@ -13,8 +13,6 @@ TUPLE: labeled-gadget < track content color ; M: labeled-gadget focusable-child* content>> ; -CONSTANT: title-bar-gradient { COLOR: white COLOR: grey90 } - : add-title-bar ( title track -- track ) swap >label [ t >>bold? ] change-font diff --git a/basis/ui/gadgets/lines/lines.factor b/basis/ui/gadgets/lines/lines.factor index 4fce5b8396..0baba808cb 100644 --- a/basis/ui/gadgets/lines/lines.factor +++ b/basis/ui/gadgets/lines/lines.factor @@ -1,14 +1,8 @@ ! Copyright (C) 2015 Nicolas Pénet. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors colors.constants kernel ui.pens.solid ; +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 ; diff --git a/basis/ui/gadgets/menus/menus.factor b/basis/ui/gadgets/menus/menus.factor index 7ca7f0816f..3931999031 100644 --- a/basis/ui/gadgets/menus/menus.factor +++ b/basis/ui/gadgets/menus/menus.factor @@ -3,7 +3,7 @@ USING: accessors colors.constants kernel locals math.rectangles math.vectors namespaces opengl sequences sorting ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.buttons ui.gadgets.corners -ui.gadgets.frames ui.gadgets.glass ui.gadgets.packs +ui.gadgets.colors ui.gadgets.frames ui.gadgets.glass ui.gadgets.packs ui.gadgets.worlds ui.tools.common ui.gestures ui.operations ui.pens ui.pens.solid ui.render ; IN: ui.gadgets.menus @@ -22,9 +22,6 @@ M:: object ( target hook command -- button ) separator-pen @@ -52,7 +49,7 @@ M: ---- { 0 3 } >>gap margins menu-border-color >>boundary - menu-background-color >>interior ; + menu-background >>interior ; : ( target hook commands -- menu ) [ ] 2with map ; diff --git a/basis/ui/gadgets/status-bar/status-bar.factor b/basis/ui/gadgets/status-bar/status-bar.factor index 99d2ea4970..4f94a0ecfb 100644 --- a/basis/ui/gadgets/status-bar/status-bar.factor +++ b/basis/ui/gadgets/status-bar/status-bar.factor @@ -2,13 +2,10 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors calendar colors.constants fonts kernel models models.arrow models.delay sequences summary ui -ui.gadgets.borders ui.gadgets.labels ui.gadgets.tracks +ui.gadgets.borders ui.gadgets.colors ui.gadgets.labels ui.gadgets.tracks ui.gadgets.worlds ui.pens.solid ui.private ; IN: ui.gadgets.status-bar -CONSTANT: status-bar-background COLOR: FactorDarkSlateBlue -CONSTANT: status-bar-foreground COLOR: white - : status-bar-font ( -- font ) sans-serif-font clone status-bar-background >>background diff --git a/basis/ui/gadgets/toolbar/toolbar.factor b/basis/ui/gadgets/toolbar/toolbar.factor index 638a3d2f57..5f9b2f4454 100644 --- a/basis/ui/gadgets/toolbar/toolbar.factor +++ b/basis/ui/gadgets/toolbar/toolbar.factor @@ -1,13 +1,11 @@ ! Copyright (C) 2015 Nicolas Pénet. ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs classes colors.constants fry kernel -ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.buttons +ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.buttons ui.gadgets.colors ui.gadgets.buttons.private ui.gadgets.packs ui.gadgets.tracks ui.pens.solid ; IN: ui.gadgets.toolbar -CONSTANT: toolbar-background COLOR: grey95 - : ( target -- toolbar ) 1 >>fill @@ -16,8 +14,11 @@ CONSTANT: toolbar-background COLOR: grey95 [ [ "toolbar" ] dip class-of get-command-at commands>> ] [ '[ [ _ ] 2dip add-gadget ] ] bi assoc-each ; + +: format-toolbar ( toolbar -- toolbar ) + { 3 3 } + toolbar-background >>interior + align-left ; : add-toolbar ( track -- track ) - dup { 3 3 } - toolbar-background >>interior - align-left f track-add ; + dup format-toolbar f track-add ; diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor index bcd787a6a8..f4d7f46f06 100644 --- a/basis/ui/tools/browser/browser.factor +++ b/basis/ui/tools/browser/browser.factor @@ -4,7 +4,7 @@ USING: accessors arrays classes colors colors.constants combinators combinators.short-circuit compiler.units debugger fry help help.apropos help.crossref help.home help.stylesheet help.topics kernel models sequences sets ui ui.commands ui.gadgets -ui.gadgets.borders ui.gadgets.buttons ui.gadgets.editors +ui.gadgets.borders ui.gadgets.buttons ui.gadgets.colors ui.gadgets.editors ui.gadgets.glass ui.gadgets.labels ui.gadgets.lines ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.tracks ui.gadgets.toolbar ui.gadgets.viewports ui.gadgets.worlds ui.gestures @@ -37,9 +37,6 @@ M: browser-gadget set-history-value : ( browser-gadget -- gadget ) model>> [ '[ _ $title ] try ] ; -CONSTANT: help-header-background -T{ rgba { red 0.9568 } { green 0.9450 } { blue 0.8509 } { alpha 1.0 } } inline - : add-help-header ( track -- track ) dup { 3 3 } help-header-background >>interior diff --git a/basis/ui/tools/browser/popups/popups.factor b/basis/ui/tools/browser/popups/popups.factor index b3fe0b4b56..b49cfdaeb5 100644 --- a/basis/ui/tools/browser/popups/popups.factor +++ b/basis/ui/tools/browser/popups/popups.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays assocs colors.constants definitions.icons fry help help.topics kernel math.rectangles -models.arrow namespaces sequences tools.crossref ui.gadgets +models.arrow namespaces sequences tools.crossref ui.gadgets ui.gadgets.colors ui.gadgets.glass ui.gadgets.labeled ui.gadgets.search-tables ui.gadgets.tables ui.gadgets.wrappers ui.gestures ui.images ui.operations ui.pens.solid ; @@ -33,7 +33,7 @@ TUPLE: links-popup < wrapper ; : ( model quot title -- gadget ) [ COLOR: white >>interior ] dip - COLOR: yellow links-popup new-wrapper ; + popup-color links-popup new-wrapper ; links-popup H{ { T{ key-down f f "ESC" } [ hide-glass ] } diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor index 45fea2e7ab..8ad9ff601e 100644 --- a/basis/ui/tools/inspector/inspector.factor +++ b/basis/ui/tools/inspector/inspector.factor @@ -3,7 +3,7 @@ USING: accessors colors inspector namespaces kernel models fry colors.constants models.arrow prettyprint sequences mirrors assocs classes io io.styles arrays hashtables math.order sorting refs fonts -ui.tools.browser ui.commands ui.operations ui.gadgets ui.gadgets.panes +ui.tools.browser ui.commands ui.operations ui.gadgets ui.gadgets.colors ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.slots ui.gadgets.tracks ui.gestures ui.gadgets.buttons ui.gadgets.lines ui.gadgets.tables ui.gadgets.toolbar ui.gadgets.status-bar @@ -81,13 +81,6 @@ M: hashtable make-slot-descriptions 40 >>min-cols 40 >>max-cols ; - - : ( model -- gadget ) vertical inspector-gadget new-track with-lines add-toolbar diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor index 54d45c17cd..06d9e43b57 100644 --- a/basis/ui/tools/listener/listener.factor +++ b/basis/ui/tools/listener/listener.factor @@ -7,7 +7,7 @@ documents.elements fry hashtables help help.markup help.tips io io.styles kernel lexer listener locals make math models models.arrow models.delay namespaces parser prettyprint quotations sequences source-files.errors strings system threads -tools.errors.model ui ui.commands ui.gadgets ui.gadgets.buttons +tools.errors.model ui ui.commands ui.gadgets ui.gadgets.buttons ui.gadgets.colors ui.gadgets.editors ui.gadgets.glass ui.gadgets.labeled ui.gadgets.lines ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.tracks ui.gadgets.toolbar @@ -212,7 +212,7 @@ TUPLE: listener-gadget < tool error-summary output scroller input ; : ( -- gadget ) error-list-model get [ drop error-summary. ] - COLOR: light-yellow >>interior ; + error-summary-background >>interior ; : init-error-summary ( listener -- listener ) >>error-summary @@ -333,12 +333,6 @@ M: object accept-completion-hook 2drop ; [ history>> history-add drop ] [ control-value ] [ select-all ] tri parse-lines-interactive ; - - : ( error continuation -- popup ) over compute-restarts [ hide-glass ] "Error" debugger-color ; diff --git a/basis/ui/tools/traceback/traceback.factor b/basis/ui/tools/traceback/traceback.factor index 6d9336a165..b35af929a9 100644 --- a/basis/ui/tools/traceback/traceback.factor +++ b/basis/ui/tools/traceback/traceback.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays colors.constants continuations fonts fry inspector kernel models models.arrow prettyprint sequences ui.commands -ui.gadgets ui.gadgets.borders ui.gadgets.buttons +ui.gadgets ui.gadgets.borders ui.gadgets.buttons ui.gadgets.colors ui.gadgets.labeled ui.gadgets.lines ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.tables ui.gadgets.toolbar ui.gadgets.tracks ui.gestures ui.tools.common ; @@ -21,10 +21,6 @@ M: stack-entry-renderer row-columns drop string>> 1array ; M: stack-entry-renderer row-value drop object>> ; -CONSTANT: data-stack-color COLOR: DodgerBlue -CONSTANT: retain-stack-color COLOR: HotPink -CONSTANT: call-stack-color COLOR: GreenYellow - : ( model -- table ) [ [ ] map ] stack-entry-renderer 10 >>min-rows diff --git a/basis/ui/tools/walker/walker.factor b/basis/ui/tools/walker/walker.factor index b5308eec07..7a681a64cb 100644 --- a/basis/ui/tools/walker/walker.factor +++ b/basis/ui/tools/walker/walker.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2006, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors colors kernel concurrency.messaging colors.constants inspector -ui.tools.listener ui.tools.traceback ui.gadgets.buttons ui.gadgets.lines +ui.tools.listener ui.tools.traceback ui.gadgets.buttons ui.gadgets.colors ui.gadgets.lines ui.gadgets.status-bar ui.gadgets.toolbar ui.gadgets.tracks ui.commands ui.gadgets models models.arrow ui.tools.browser ui.tools.common ui.gestures ui.gadgets.labels ui.pens.solid ui threads namespaces make tools.walker assocs @@ -54,13 +54,10 @@ M: walker-gadget focusable-child* : ( model thread -- gadget ) '[ _ walker-state-string ] ; - -CONSTANT: thread-status-color -T{ rgba { red 0.9295 } { green 0.9569 } { blue 0.8510 } { alpha 1.0 } } inline : add-thread-status ( track -- track ) dup status>> self margins - thread-status-color >>interior + thread-status-background >>interior f track-add ; : add-traceback ( track -- track )