From 10bbfc3d5f856c85dab3ba56b3278fce25aa0fcc Mon Sep 17 00:00:00 2001 From: slava Date: Thu, 20 Jul 2006 00:39:41 +0000 Subject: [PATCH] Move editor-theme word to the right place --- library/ui/gadgets/theme.factor | 14 +++++++++++--- library/ui/text/editor.factor | 6 ------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/library/ui/gadgets/theme.factor b/library/ui/gadgets/theme.factor index e1ab9530fa..40ddea697c 100644 --- a/library/ui/gadgets/theme.factor +++ b/library/ui/gadgets/theme.factor @@ -7,6 +7,12 @@ IN: gadgets-labels DEFER: set-label-color DEFER: set-label-font +IN: gadgets-text +DEFER: set-editor-color +DEFER: set-editor-caret-color +DEFER: set-editor-selection-color +DEFER: set-editor-font + IN: gadgets-theme USING: arrays gadgets kernel sequences styles ; @@ -87,9 +93,11 @@ USING: arrays gadgets kernel sequences styles ; { 0.0 0.0 0.0 1.0 } over set-label-color { "monospace" plain 12 } swap set-label-font ; -: editor-theme ( gadget -- ) - { 0.0 0.0 0.0 1.0 } over set-label-color - { "monospace" bold 12 } swap set-label-font ; +: editor-theme ( editor -- ) + { 0.0 0.0 0.0 1.0 } over set-editor-color + { 1.0 0.0 0.0 1.0 } over set-editor-caret-color + { 0.8 0.8 1.0 1.0 } over set-editor-selection-color + { "monospace" plain 12 } swap set-editor-font ; : highlight-theme ( gadget -- ) T{ solid f { 0.8 0.8 0.8 1.0 } } swap set-gadget-interior ; diff --git a/library/ui/text/editor.factor b/library/ui/text/editor.factor index 0e4b5e5fb5..86253ce607 100644 --- a/library/ui/text/editor.factor +++ b/library/ui/text/editor.factor @@ -12,12 +12,6 @@ font color caret-color selection-color caret mark focused? ; -: editor-theme ( editor -- ) - { 0.0 0.0 0.0 1.0 } over set-editor-color - { 1.0 0.0 0.0 1.0 } over set-editor-caret-color - { 0.8 0.8 1.0 1.0 } over set-editor-selection-color - { "monospace" plain 12 } swap set-editor-font ; - TUPLE: action-relayout-1 editor ; M: action-relayout-1 model-changed