mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-16 03:30:42 +00:00
Fixed: changed theme attributes image-search-left-margin image-cancel-right-margin by image-search-inset and image-cancel-inset in CPSearchField
This commit is contained in:
1 parent
b16b8388ef
commit
4d7cb06481
3 files changed
+16
-14
No files matched your search
@@ -74,8 +74,8 @@ var RECENT_SEARCH_PREFIX = @" ";
|
||||
@"image-find": [CPNull null],
|
||||
@"image-cancel": [CPNull null],
|
||||
@"image-cancel-pressed": [CPNull null],
|
||||
@"image-search-left-margin" : 0,
|
||||
@"image-cancel-right-margin" : 0
|
||||
@"image-search-inset" : CGInsetMake(0, 0, 0, 5),
|
||||
@"image-cancel-inset" : CGInsetMake(0, 5, 0, 0)
|
||||
};
|
||||
}
|
||||
|
||||
@@ -268,9 +268,10 @@ var RECENT_SEARCH_PREFIX = @" ";
|
||||
*/
|
||||
- (CGRect)searchButtonRectForBounds:(CGRect)rect
|
||||
{
|
||||
var size = [[self currentValueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero();
|
||||
var size = [[self currentValueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero(),
|
||||
inset = [self currentValueForThemeAttribute:@"image-search-inset"];
|
||||
|
||||
return CGRectMake([self currentValueForThemeAttribute:@"image-search-left-margin"], (CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
|
||||
return CGRectMake(inset.left - inset.right, inset.top - inset.bottom + (CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -280,9 +281,10 @@ var RECENT_SEARCH_PREFIX = @" ";
|
||||
*/
|
||||
- (CGRect)cancelButtonRectForBounds:(CGRect)rect
|
||||
{
|
||||
var size = [[self currentValueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero();
|
||||
var size = [[self currentValueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero(),
|
||||
inset = [self currentValueForThemeAttribute:@"image-cancel-inset"];
|
||||
|
||||
return CGRectMake(CGRectGetWidth(rect) - size.width - [self currentValueForThemeAttribute:@"image-cancel-right-margin"], (CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
|
||||
return CGRectMake(CGRectGetWidth(rect) - size.width + inset.left - inset.right, inset.top - inset.bottom + (CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
|
||||
}
|
||||
|
||||
// Managing Menu Templates
|
||||
|
||||
@@ -1243,8 +1243,8 @@ var themedButtonValues = nil,
|
||||
|
||||
overrides =
|
||||
[
|
||||
[@"image-search-left-margin", 5],
|
||||
[@"image-cancel-right-margin", 5],
|
||||
[@"image-search-inset", CGInsetMake(0, 0, 0, 5)],
|
||||
[@"image-cancel-inset", CGInsetMake(0, 5, 0, 0)],
|
||||
|
||||
[@"image-search", imageSearch],
|
||||
[@"image-find", imageFind],
|
||||
@@ -1255,15 +1255,15 @@ var themedButtonValues = nil,
|
||||
[@"image-find", smallImageFind, CPThemeStateControlSizeSmall],
|
||||
[@"image-cancel", smallImageCancel, CPThemeStateControlSizeSmall],
|
||||
[@"image-cancel-pressed", smallImageCancelPressed, CPThemeStateControlSizeSmall],
|
||||
[@"image-search-left-margin", 8, CPThemeStateControlSizeSmall],
|
||||
[@"image-cancel-right-margin", 8, CPThemeStateControlSizeSmall],
|
||||
[@"image-search-inset", CGInsetMake(0, 0, 0, 8), CPThemeStateControlSizeSmall],
|
||||
[@"image-cancel-inset", CGInsetMake(0, 8, 0, 0), CPThemeStateControlSizeSmall],
|
||||
|
||||
[@"image-search", miniImageSearch, CPThemeStateControlSizeMini],
|
||||
[@"image-find", miniImageFind, CPThemeStateControlSizeMini],
|
||||
[@"image-cancel", miniImageCancel, CPThemeStateControlSizeMini],
|
||||
[@"image-cancel-pressed", miniImageCancelPressed, CPThemeStateControlSizeMini],
|
||||
[@"image-search-left-margin", 8, CPThemeStateControlSizeMini],
|
||||
[@"image-cancel-right-margin", 8, CPThemeStateControlSizeMini],
|
||||
[@"image-search-inset", CGInsetMake(0, 0, 0, 8), CPThemeStateControlSizeMini],
|
||||
[@"image-cancel-inset", CGInsetMake(0, 8, 0, 0), CPThemeStateControlSizeMini],
|
||||
];
|
||||
|
||||
[self registerThemeValues:overrides forView:searchField inherit:themedRoundedTextFieldValues];
|
||||
|
||||
@@ -824,8 +824,8 @@ var themedButtonValues = nil,
|
||||
|
||||
overrides =
|
||||
[
|
||||
[@"image-search-left-margin", 5],
|
||||
[@"image-cancel-right-margin", 5],
|
||||
[@"image-search-inset", CGInsetMake(0, 0, 0, 5)],
|
||||
[@"image-cancel-inset", CGInsetMake(0, 5, 0, 0)],
|
||||
|
||||
[@"image-search", imageSearch],
|
||||
[@"image-find", imageFind],
|
||||
|
||||
Reference in new issue
Block a user