mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-22 14:35:52 +00:00
Fixed alignement content-inset and images for control size small and mini.
This commit is contained in:
1 parent
c1441eb758
commit
f48e2f3b18
3 files changed
+64
-24
No files matched your search
@@ -266,7 +266,7 @@ var RECENT_SEARCH_PREFIX = @" ";
|
||||
*/
|
||||
- (CGRect)searchButtonRectForBounds:(CGRect)rect
|
||||
{
|
||||
var size = [[self valueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero();
|
||||
var size = [[self currentValueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero();
|
||||
|
||||
return CGRectMake(5, (CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
|
||||
}
|
||||
@@ -278,7 +278,7 @@ var RECENT_SEARCH_PREFIX = @" ";
|
||||
*/
|
||||
- (CGRect)cancelButtonRectForBounds:(CGRect)rect
|
||||
{
|
||||
var size = [[self valueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero();
|
||||
var size = [[self currentValueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero();
|
||||
|
||||
return CGRectMake(CGRectGetWidth(rect) - size.width - 5, (CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
|
||||
}
|
||||
|
||||
@@ -1196,14 +1196,14 @@ var themedButtonValues = nil,
|
||||
[@"nib2cib-adjustment-frame", CGRectMake(-2.0, 7.0, 5.0, 10.0), [CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
|
||||
// CPThemeStateControlSizeSmall
|
||||
[@"content-inset", CGInsetMake(8.0, 6.0, 4.0, 6.0), [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]],
|
||||
[@"content-inset", CGInsetMake(8.0, 6.0, 4.0, 6.0), [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
[@"bezel-inset", CGInsetMake(2.0, 4.0, 2.0, 4.0), [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
[@"min-size", CGSizeMake(0.0, 28.0), [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
[@"max-size", CGSizeMake(-1.0, 28.0), [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
[@"nib2cib-adjustment-frame", CGRectMake(-6.0, 5.0, 13.0, 9.0), [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
|
||||
// CPThemeStateControlSizeMini
|
||||
[@"content-inset", CGInsetMake(8.0, 6.0, 4.0, 6.0), [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]],
|
||||
[@"content-inset", CGInsetMake(8.0, 6.0, 4.0, 6.0), [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
[@"bezel-inset", CGInsetMake(2.0, 4.0, 2.0, 4.0), [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
[@"min-size", CGSizeMake(0.0, 26.0), [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
[@"max-size", CGSizeMake(-1.0, 26.0), [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
@@ -1226,17 +1226,37 @@ var themedButtonValues = nil,
|
||||
{
|
||||
var searchField = [[CPSearchField alloc] initWithFrame:CGRectMake(0.0, 0.0, 160.0, 30.0)],
|
||||
|
||||
imageSearch = PatternImage("search-field-search.png", 25.0, 22.0),
|
||||
imageFind = PatternImage("search-field-find.png", 25.0, 22.0),
|
||||
imageCancel = PatternImage("search-field-cancel.png", 22.0, 22.0),
|
||||
imageCancelPressed = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
|
||||
imageSearch = PatternImage("search-field-search.png", 25.0, 22.0),
|
||||
imageFind = PatternImage("search-field-find.png", 25.0, 22.0),
|
||||
imageCancel = PatternImage("search-field-cancel.png", 22.0, 22.0),
|
||||
imageCancelPressed = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
|
||||
|
||||
smallImageSearch = PatternImage("search-field-search.png", 25.0, 20.0),
|
||||
smallImageFind = PatternImage("search-field-find.png", 25.0, 20.0),
|
||||
smallImageCancel = PatternImage("search-field-cancel.png", 22.0, 20.0),
|
||||
smallImageCancelPressed = PatternImage("search-field-cancel-pressed.png", 22.0, 21.0),
|
||||
|
||||
miniImageSearch = PatternImage("search-field-search.png", 25.0, 20.0),
|
||||
miniImageFind = PatternImage("search-field-find.png", 25.0, 20.0),
|
||||
miniImageCancel = PatternImage("search-field-cancel.png", 22.0, 21.0),
|
||||
miniImageCancelPressed = PatternImage("search-field-cancel-pressed.png", 22.0, 21.0),
|
||||
|
||||
overrides =
|
||||
[
|
||||
[@"image-search", imageSearch],
|
||||
[@"image-find", imageFind],
|
||||
[@"image-cancel", imageCancel],
|
||||
[@"image-cancel-pressed", imageCancelPressed]
|
||||
[@"image-search", imageSearch],
|
||||
[@"image-find", imageFind],
|
||||
[@"image-cancel", imageCancel],
|
||||
[@"image-cancel-pressed", imageCancelPressed],
|
||||
|
||||
[@"image-search", smallImageSearch, CPThemeStateControlSizeSmall],
|
||||
[@"image-find", smallImageFind, CPThemeStateControlSizeSmall],
|
||||
[@"image-cancel", smallImageCancel, CPThemeStateControlSizeSmall],
|
||||
[@"image-cancel-pressed", smallImageCancelPressed, CPThemeStateControlSizeSmall],
|
||||
|
||||
[@"image-search", miniImageSearch, CPThemeStateControlSizeMini],
|
||||
[@"image-find", miniImageFind, CPThemeStateControlSizeMini],
|
||||
[@"image-cancel", miniImageCancel, CPThemeStateControlSizeMini],
|
||||
[@"image-cancel-pressed", miniImageCancelPressed, CPThemeStateControlSizeMini],
|
||||
];
|
||||
|
||||
[self registerThemeValues:overrides forView:searchField inherit:themedRoundedTextFieldValues];
|
||||
|
||||
@@ -760,8 +760,8 @@ var themedButtonValues = nil,
|
||||
|
||||
[@"font", [CPFont systemFontOfSize:CPFontCurrentSystemSize]],
|
||||
|
||||
[@"content-inset", CGInsetMake(6.0, 10.0, 4.0, 10.0), [CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
[@"content-inset", CGInsetMake(6.0, 10.0, 4.0, 10.0), [CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]],
|
||||
[@"content-inset", CGInsetMake(7.0, 10.0, 4.0, 10.0), [CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
[@"content-inset", CGInsetMake(7.0, 10.0, 4.0, 10.0), [CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]],
|
||||
|
||||
[@"bezel-inset", CGInsetMake(3.0, 4.0, 3.0, 4.0), [CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
[@"bezel-inset", CGInsetMake(0.0, 1.0, 0.0, 1.0), [CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]],
|
||||
@@ -775,7 +775,7 @@ var themedButtonValues = nil,
|
||||
[@"nib2cib-adjustment-frame", CGRectMake(-4.0, 7.0, 8.0, 10.0), [CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
|
||||
// CPThemeStateControlSizeSmall
|
||||
[@"content-inset", CGInsetMake(6.0, 6.0, 4.0, 6.0), [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]],
|
||||
[@"content-inset", CGInsetMake(7.0, 6.0, 4.0, 6.0), [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
[@"bezel-inset", CGInsetMake(2.0, 4.0, 2.0, 4.0), [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
[@"bezel-inset", CGInsetMake(0.0, 1.0, 0.0, 1.0), [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]],
|
||||
[@"min-size", CGSizeMake(0.0, 25.0), [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
@@ -783,7 +783,7 @@ var themedButtonValues = nil,
|
||||
[@"nib2cib-adjustment-frame", CGRectMake(-4.0, 7.0, 8.0, 9.0), [CPThemeStateControlSizeSmall, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
|
||||
// CPThemeStateControlSizeMini
|
||||
[@"content-inset", CGInsetMake(6.0, 6.0, 4.0, 6.0), [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]],
|
||||
[@"content-inset", CGInsetMake(7.0, 6.0, 4.0, 6.0), [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
[@"bezel-inset", CGInsetMake(2.0, 4.0, 2.0, 4.0), [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
[@"bezel-inset", CGInsetMake(0.0, 1.0, 0.0, 1.0), [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled, CPThemeStateEditing]],
|
||||
[@"min-size", CGSizeMake(0.0, 22.0), [CPThemeStateControlSizeMini, CPTextFieldStateRounded, CPThemeStateBezeled]],
|
||||
@@ -807,17 +807,37 @@ var themedButtonValues = nil,
|
||||
{
|
||||
var searchField = [[CPSearchField alloc] initWithFrame:CGRectMake(0.0, 0.0, 160.0, 29.0)],
|
||||
|
||||
imageSearch = PatternImage("search-field-search.png", 25.0, 22.0),
|
||||
imageFind = PatternImage("search-field-find.png", 25.0, 22.0),
|
||||
imageCancel = PatternImage("search-field-cancel.png", 22.0, 22.0),
|
||||
imageCancelPressed = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
|
||||
imageSearch = PatternImage("search-field-search.png", 25.0, 22.0),
|
||||
imageFind = PatternImage("search-field-find.png", 25.0, 22.0),
|
||||
imageCancel = PatternImage("search-field-cancel.png", 22.0, 22.0),
|
||||
imageCancelPressed = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
|
||||
|
||||
smallImageSearch = PatternImage("search-field-search.png", 25.0, 22.0),
|
||||
smallImageFind = PatternImage("search-field-find.png", 25.0, 22.0),
|
||||
smallImageCancel = PatternImage("search-field-cancel.png", 22.0, 22.0),
|
||||
smallImageCancelPressed = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
|
||||
|
||||
miniImageSearch = PatternImage("search-field-search.png", 25.0, 22.0),
|
||||
miniImageFind = PatternImage("search-field-find.png", 25.0, 22.0),
|
||||
miniImageCancel = PatternImage("search-field-cancel.png", 22.0, 22.0),
|
||||
miniImageCancelPressed = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
|
||||
|
||||
overrides =
|
||||
[
|
||||
[@"image-search", imageSearch],
|
||||
[@"image-find", imageFind],
|
||||
[@"image-cancel", imageCancel],
|
||||
[@"image-cancel-pressed", imageCancelPressed]
|
||||
[@"image-search", imageSearch],
|
||||
[@"image-find", imageFind],
|
||||
[@"image-cancel", imageCancel],
|
||||
[@"image-cancel-pressed", imageCancelPressed],
|
||||
|
||||
[@"image-search", smallImageSearch, CPThemeStateControlSizeSmall],
|
||||
[@"image-find", smallImageFind, CPThemeStateControlSizeSmall],
|
||||
[@"image-cancel", smallImageCancel, CPThemeStateControlSizeSmall],
|
||||
[@"image-cancel-pressed", smallImageCancelPressed, CPThemeStateControlSizeSmall],
|
||||
|
||||
[@"image-search", miniImageSearch, CPThemeStateControlSizeMini],
|
||||
[@"image-find", miniImageFind, CPThemeStateControlSizeMini],
|
||||
[@"image-cancel", miniImageCancel, CPThemeStateControlSizeMini],
|
||||
[@"image-cancel-pressed", miniImageCancelPressed, CPThemeStateControlSizeMini],
|
||||
];
|
||||
|
||||
[self registerThemeValues:overrides forView:searchField inherit:themedRoundedTextFieldValues];
|
||||
|
||||
Reference in new issue
Block a user