colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-14 14:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

New: added themeAttributes image-search-left-margin and image-cancel-right-margin in CPSearchField

Browse Source
This commit is contained in:
Alexandre Wilhelm
2015-03-23 10:45:43 -07:00
parent f48e2f3b18
commit b1e89e7904
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPSearchField.j
+5 -3
View File
@@ -73,7 +73,9 @@ var RECENT_SEARCH_PREFIX = @" ";
@"image-search": [CPNull null],
@"image-find": [CPNull null],
@"image-cancel": [CPNull null],
@"image-cancel-pressed": [CPNull null]
@"image-cancel-pressed": [CPNull null],
@"image-search-left-margin" : 0,
@"image-cancel-right-margin" : 0
};
}
@@ -268,7 +270,7 @@ var RECENT_SEARCH_PREFIX = @" ";
{
var size = [[self currentValueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero();
return CGRectMake(5, (CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
return CGRectMake([self currentValueForThemeAttribute:@"image-search-left-margin"], (CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
}
/*!
@@ -280,7 +282,7 @@ var RECENT_SEARCH_PREFIX = @" ";
{
var size = [[self currentValueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero();
return CGRectMake(CGRectGetWidth(rect) - size.width - 5, (CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
return CGRectMake(CGRectGetWidth(rect) - size.width - [self currentValueForThemeAttribute:@"image-cancel-right-margin"], (CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
}
// Managing Menu Templates
AppKit/Themes/Aristo/ThemeDescriptors.j
+15 -8
View File
@@ -1243,20 +1243,27 @@ var themedButtonValues = nil,
overrides =
[
[@"image-search-left-margin", 5],
[@"image-cancel-right-margin", 5],
[@"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", smallImageSearch, CPThemeStateControlSizeSmall],
[@"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", miniImageSearch, CPThemeStateControlSizeMini],
[@"image-find", miniImageFind, CPThemeStateControlSizeMini],
[@"image-cancel", miniImageCancel, CPThemeStateControlSizeMini],
[@"image-cancel-pressed", miniImageCancelPressed, CPThemeStateControlSizeMini],
[@"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],
];
[self registerThemeValues:overrides forView:searchField inherit:themedRoundedTextFieldValues];
AppKit/Themes/Aristo2/ThemeDescriptors.j
+3
View File
@@ -824,6 +824,9 @@ var themedButtonValues = nil,
overrides =
[
[@"image-search-left-margin", 5],
[@"image-cancel-right-margin", 5],
[@"image-search", imageSearch],
[@"image-find", imageFind],
[@"image-cancel", imageCancel],