From d50439161a409c22b044b9a7702caadd04044075 Mon Sep 17 00:00:00 2001 From: Andrew Hankinson Date: Tue, 26 Mar 2013 19:19:03 -0400 Subject: [PATCH] Fixed: Combo box disabled state dims text Previously, setting a CPComboBox to disabled would not dim the text. This commit fixes the theme state to include a setting for the text colour and text shadow colour. --- AppKit/Themes/Aristo2/ThemeDescriptors.j | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index 237fb1d57..59d3cb7e8 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -834,7 +834,10 @@ var themedButtonValues = nil, // Because combo box uses a three-part bezel, the height is fixed [@"min-size", CGSizeMake(0, 31.0)], - [@"max-size", CGSizeMake(-1, 31.0)] + [@"max-size", CGSizeMake(-1, 31.0)], + + [@"text-color", [CPColor colorWithCalibratedWhite:0.6 alpha:1.0], CPThemeStateBordered | CPThemeStateDisabled], + [@"text-shadow-color", [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:0.6], CPThemeStateBordered | CPThemeStateDisabled], ]; [self registerThemeValues:overrides forView:combo inherit:themedTextFieldValues];