colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-30 15:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cptextfield-cpthemestateeditable' into CPTableViewLion

Browse Source
This commit is contained in:
cacaodev
2012-06-22 18:27:25 +02:00
parent a444a7de19 4369f4b5bb
commit 6281f188f8
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTextField.j
+5
View File
@@ -291,6 +291,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
// We only allow first responder status if the field is editable and enabled.
if (!shouldBeEditable && [[self window] firstResponder] === self)
[[self window] makeFirstResponder:nil];
if (shouldBeEditable)
[self setThemeState:CPThemeStateEditable];
else
[self unsetThemeState:CPThemeStateEditable];
}
/*!
AppKit/Themes/Aristo/ThemeDescriptors.j
+1 -1
View File
@@ -925,7 +925,7 @@ var themedButtonValues = nil,
[@"text-color", [CPColor colorWithCalibratedWhite:51.0 / 255.0 alpha:1.0], CPThemeStateTableDataView],
[@"text-color", [CPColor whiteColor], CPThemeStateTableDataView | CPThemeStateSelectedTableDataView],
[@"font", [CPFont boldSystemFontOfSize:12.0], CPThemeStateTableDataView | CPThemeStateSelectedTableDataView],
[@"text-color", [CPColor blackColor], CPThemeStateTableDataView | CPThemeStateEditing],
[@"text-color", [CPColor blackColor], CPThemeStateTableDataView | CPThemeStateEditable],
[@"content-inset", CGInsetMake(7.0, 7.0, 5.0, 8.0), CPThemeStateTableDataView | CPThemeStateEditing],
[@"font", [CPFont systemFontOfSize:12.0], CPThemeStateTableDataView | CPThemeStateEditing],
[@"bezel-inset", CGInsetMake(-2.0, -2.0, -2.0, -2.0), CPThemeStateTableDataView | CPThemeStateEditing],