aboutsummaryrefslogtreecommitdiffstats
path: root/Framework
diff options
context:
space:
mode:
authorshinya takahashi2015-01-19 18:03:33 +0900
committershinya takahashi2015-02-13 01:05:14 +0900
commitaeaad2986f322ce7fcdde2ef7fb8049a62f5a0d6 (patch)
tree6b3052926a91388128c7ce930461cd185142db5f /Framework
parent04987a7bd512ef55425e552233fa5440531ee80f (diff)
downloadMASShortcut-aeaad2986f322ce7fcdde2ef7fb8049a62f5a0d6.tar.bz2
Added options to show button that delete hot key.
Diffstat (limited to 'Framework')
-rw-r--r--Framework/MASShortcutView.m14
1 files changed, 11 insertions, 3 deletions
diff --git a/Framework/MASShortcutView.m b/Framework/MASShortcutView.m
index d521880..cb6f3d9 100644
--- a/Framework/MASShortcutView.m
+++ b/Framework/MASShortcutView.m
@@ -13,6 +13,7 @@ NSString *const MASShortcutBinding = @"shortcutValue";
@property (nonatomic, getter = isHinting) BOOL hinting;
@property (nonatomic, copy) NSString *shortcutPlaceholder;
+@property (nonatomic, assign) BOOL showsDeleteButton;
@end
@@ -57,6 +58,7 @@ NSString *const MASShortcutBinding = @"shortcutValue";
_shortcutCell.font = [[NSFontManager sharedFontManager] convertFont:_shortcutCell.font toSize:BUTTON_FONT_SIZE];
_shortcutValidator = [MASShortcutValidator sharedValidator];
_enabled = YES;
+ _showsDeleteButton = YES;
[self resetShortcutCellStyle];
}
@@ -188,9 +190,15 @@ NSString *const MASShortcutBinding = @"shortcutValue";
- (void)drawRect:(CGRect)dirtyRect
{
if (self.shortcutValue) {
- [self drawInRect:self.bounds withTitle:NSStringFromMASKeyCode(self.recording ? kMASShortcutGlyphEscape : kMASShortcutGlyphClear)
- alignment:NSRightTextAlignment state:NSOffState];
-
+ NSString *buttonTitle;
+ if (self.recording) {
+ buttonTitle = NSStringFromMASKeyCode(kMASShortcutGlyphEscape);
+ } else if (self.showsDeleteButton) {
+ buttonTitle = NSStringFromMASKeyCode(kMASShortcutGlyphClear);
+ }
+ if (buttonTitle != nil) {
+ [self drawInRect:self.bounds withTitle:buttonTitle alignment:NSRightTextAlignment state:NSOffState];
+ }
CGRect shortcutRect;
[self getShortcutRect:&shortcutRect hintRect:NULL];
NSString *title = (self.recording