From 55b97a7eebb7e7e75b8858bf25458ad4834888db Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Wed, 2 Feb 2011 12:02:46 +0100 Subject: [PATCH 1/2] fix CPSearchField layout glitch --- AppKit/Themes/Aristo/ThemeDescriptors.j | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index a14978f67..e0d710167 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -901,7 +901,13 @@ var themedButtonValues = nil, + (CPSearchField)themedSearchField { var searchField = [[CPSearchField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 30.0)]; - [self registerThemeValues:nil forView:searchField inherit:themedRoundedTextFieldValues]; + + searchFieldThemeValues = [ + [@"content-inset", CGInsetMake(8.0, 14.0, 6.0, 14.0), CPTextFieldStateRounded | CPThemeStateBezeled], + [@"content-inset", CGInsetMake(7.0, 15.0, 6.0, 16.0), CPTextFieldStateRounded | CPThemeStateBezeled | CPThemeStateEditing], + ] + + [self registerThemeValues:searchFieldThemeValues forView:searchField inherit:themedRoundedTextFieldValues]; return searchField; } From 8994f08cbfb9409f76cb21d534308ef6b6df71db Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Wed, 2 Feb 2011 18:27:31 +0100 Subject: [PATCH 2/2] move the fix to themedRoundedTextField: --- AppKit/Themes/Aristo/ThemeDescriptors.j | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index e0d710167..992c7951d 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -876,7 +876,9 @@ var themedButtonValues = nil, [@"bezel-color", bezelFocusedColor, CPTextFieldStateRounded | CPThemeStateBezeled | CPThemeStateEditing], [@"font", [CPFont systemFontOfSize:12.0]], - [@"content-inset", CGInsetMake(9.0, 14.0, 6.0, 14.0), CPTextFieldStateRounded | CPThemeStateBezeled], + [@"content-inset", CGInsetMake(8.0, 14.0, 6.0, 14.0), CPTextFieldStateRounded | CPThemeStateBezeled], + [@"content-inset", CGInsetMake(7.0, 14.0, 6.0, 14.0), CPTextFieldStateRounded | CPThemeStateBezeled | CPThemeStateEditing], + [@"bezel-inset", CGInsetMake(4.0, 4.0, 4.0, 4.0), CPTextFieldStateRounded | CPThemeStateBezeled], [@"bezel-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), CPTextFieldStateRounded | CPThemeStateBezeled | CPThemeStateEditing], @@ -901,13 +903,8 @@ var themedButtonValues = nil, + (CPSearchField)themedSearchField { var searchField = [[CPSearchField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 30.0)]; - - searchFieldThemeValues = [ - [@"content-inset", CGInsetMake(8.0, 14.0, 6.0, 14.0), CPTextFieldStateRounded | CPThemeStateBezeled], - [@"content-inset", CGInsetMake(7.0, 15.0, 6.0, 16.0), CPTextFieldStateRounded | CPThemeStateBezeled | CPThemeStateEditing], - ] - - [self registerThemeValues:searchFieldThemeValues forView:searchField inherit:themedRoundedTextFieldValues]; + + [self registerThemeValues:nil forView:searchField inherit:themedRoundedTextFieldValues]; return searchField; }