From 76689c2d13e9501b11c6154798fa38be7141b130 Mon Sep 17 00:00:00 2001 From: jenglish Date: Thu, 2 Sep 2010 17:47:06 +0000 Subject: library/ttk/winTheme.tcl, library/ttk/xpTheme.tcl, library/ttk/vistaTheme.tcl: Specify disabled combobox text foreground color [#3057573]. --- ChangeLog | 6 ++++++ library/ttk/vistaTheme.tcl | 5 ++++- library/ttk/winTheme.tcl | 10 ++++++++-- library/ttk/xpTheme.tcl | 7 +++++-- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 939b46d..3f9713e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-10-02 Joe English + + * library/ttk/winTheme.tcl, library/ttk/xpTheme.tcl, + library/ttk/vistaTheme.tcl: Specify disabled combobox text + foreground color [Bug#3057573]. + 2010-08-31 Andreas Kupries * win/tcl.m4: Applied patch by Jeff fixing issues with the diff --git a/library/ttk/vistaTheme.tcl b/library/ttk/vistaTheme.tcl index 107f227..811a1a4 100644 --- a/library/ttk/vistaTheme.tcl +++ b/library/ttk/vistaTheme.tcl @@ -92,7 +92,10 @@ namespace eval ttk::theme::vista { ttk::style map TCombobox \ -selectbackground [list !focus SystemWindow] \ -selectforeground [list !focus SystemWindowText] \ - -foreground [list {readonly focus} SystemHighlightText] \ + -foreground [list \ + disabled SystemGrayText \ + {readonly focus} SystemHighlightText \ + ] \ -focusfill [list {readonly focus} SystemHighlight] \ ; diff --git a/library/ttk/winTheme.tcl b/library/ttk/winTheme.tcl index 7ee19f5..ec7cf02 100644 --- a/library/ttk/winTheme.tcl +++ b/library/ttk/winTheme.tcl @@ -1,5 +1,5 @@ # -# $Id: winTheme.tcl,v 1.9 2008/11/29 00:43:48 patthoyts Exp $ +# $Id: winTheme.tcl,v 1.10 2010/09/02 17:47:06 jenglish Exp $ # # Settings for 'winnative' theme. # @@ -41,7 +41,13 @@ namespace eval ttk::theme::winnative { ttk::style map TCombobox \ -selectbackground [list !focus SystemWindow] \ -selectforeground [list !focus SystemWindowText] \ - -foreground [list {readonly focus} SystemHighlightText] \ + -fieldbackground [list \ + readonly SystemButtonFace \ + disabled SystemButtonFace] \ + -foreground [list \ + disabled SystemGrayText \ + {readonly focus} SystemHighlightText \ + ] \ -focusfill [list {readonly focus} SystemHighlight] \ ; diff --git a/library/ttk/xpTheme.tcl b/library/ttk/xpTheme.tcl index d786841..5948b56 100644 --- a/library/ttk/xpTheme.tcl +++ b/library/ttk/xpTheme.tcl @@ -1,5 +1,5 @@ # -# $Id: xpTheme.tcl,v 1.12 2008/12/05 11:11:58 patthoyts Exp $ +# $Id: xpTheme.tcl,v 1.13 2010/09/02 17:47:06 jenglish Exp $ # # Settings for 'xpnative' theme # @@ -48,7 +48,10 @@ namespace eval ttk::theme::xpnative { ttk::style map TCombobox \ -selectbackground [list !focus SystemWindow] \ -selectforeground [list !focus SystemWindowText] \ - -foreground [list {readonly focus} SystemHighlightText] \ + -foreground [list \ + disabled SystemGrayText \ + {readonly focus} SystemHighlightText \ + ] \ -focusfill [list {readonly focus} SystemHighlight] \ ; -- cgit v0.12