From f240f189e1c58bf536bfb57ea6875b28fbbff9d5 Mon Sep 17 00:00:00 2001 From: nicolas-p Date: Sat, 25 Jul 2015 11:53:00 +0200 Subject: [PATCH] Improved contents table in Inspector --- basis/ui/gadgets/colors/colors.factor | 2 ++ basis/ui/gadgets/tables/tables.factor | 4 +--- basis/ui/tools/inspector/inspector.factor | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/basis/ui/gadgets/colors/colors.factor b/basis/ui/gadgets/colors/colors.factor index 8d18322dbe..8a5447a356 100644 --- a/basis/ui/gadgets/colors/colors.factor +++ b/basis/ui/gadgets/colors/colors.factor @@ -13,6 +13,8 @@ CONSTANT: status-bar-foreground COLOR: white CONSTANT: line-color COLOR: grey75 +CONSTANT: column-title-background COLOR: grey95 + CONSTANT: source-files-color COLOR: NavajoWhite CONSTANT: errors-color COLOR: chocolate1 CONSTANT: details-color COLOR: SlateGray2 diff --git a/basis/ui/gadgets/tables/tables.factor b/basis/ui/gadgets/tables/tables.factor index 8a88000de7..a994b9ed8c 100644 --- a/basis/ui/gadgets/tables/tables.factor +++ b/basis/ui/gadgets/tables/tables.factor @@ -4,7 +4,7 @@ USING: accessors arrays colors colors.constants combinators combinators.short-circuit fonts fry kernel locals math math.functions math.order math.rectangles math.vectors models namespaces opengl sequences splitting strings ui.commands -ui.gadgets ui.gadgets.line-support ui.gadgets.menus +ui.gadgets ui.gadgets.colors ui.gadgets.line-support ui.gadgets.menus ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.worlds ui.gestures ui.images ui.pens.solid ui.render ui.text ; IN: ui.gadgets.tables @@ -81,8 +81,6 @@ M: image-name draw-cell nip draw-image ; : column-offsets ( widths gap -- x xs ) [ 0 ] dip '[ _ + + ] accumulate ; -CONSTANT: column-title-background COLOR: light-gray - : column-title-font ( font -- font' ) column-title-background font-with-background t >>bold? ; diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor index 04071798ad..efd686cb3c 100644 --- a/basis/ui/tools/inspector/inspector.factor +++ b/basis/ui/tools/inspector/inspector.factor @@ -87,7 +87,7 @@ M: hashtable make-slot-descriptions swap >>model dup model>> >>table dup model>> margins white-interior "Object" object-color f track-add - dup table>> white-interior "Contents" contents-color 1 track-add ; + dup table>> margins white-interior "Contents" contents-color 1 track-add ; M: inspector-gadget focusable-child* table>> ;