diff options
| author | Tomáš Znamenáček | 2015-01-07 15:58:13 +0100 |
|---|---|---|
| committer | Tomáš Znamenáček | 2015-01-07 16:26:49 +0100 |
| commit | 9a223134d0b2f5dabf5dcd00f07c0a252c73e516 (patch) | |
| tree | f07fc5b8d503acece22107ade7cfdb6171c0a69c /Framework | |
| parent | d4ba2e7a36a06880553d2ad95c1d295f706a2c7f (diff) | |
| download | MASShortcut-9a223134d0b2f5dabf5dcd00f07c0a252c73e516.tar.bz2 | |
Fixed MASShortcutView initialization errors after rebase.
Diffstat (limited to 'Framework')
| -rw-r--r-- | Framework/MASShortcutView.m | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Framework/MASShortcutView.m b/Framework/MASShortcutView.m index cdb7855..0ae8f6c 100644 --- a/Framework/MASShortcutView.m +++ b/Framework/MASShortcutView.m @@ -46,12 +46,6 @@ NSString *const MASShortcutBinding = @"shortcutValue"; self = [super initWithCoder:coder]; if (self) { [self commonInit]; - _shortcutCell = [[[self.class shortcutCellClass] alloc] init]; - _shortcutCell.buttonType = NSPushOnPushOffButton; - _shortcutCell.font = [[NSFontManager sharedFontManager] convertFont:_shortcutCell.font toSize:BUTTON_FONT_SIZE]; - _shortcutValidator = [MASShortcutValidator sharedValidator]; - _enabled = YES; - [self resetShortcutCellStyle]; } return self; } @@ -61,6 +55,7 @@ NSString *const MASShortcutBinding = @"shortcutValue"; _shortcutCell = [[[self.class shortcutCellClass] alloc] init]; _shortcutCell.buttonType = NSPushOnPushOffButton; _shortcutCell.font = [[NSFontManager sharedFontManager] convertFont:_shortcutCell.font toSize:BUTTON_FONT_SIZE]; + _shortcutValidator = [MASShortcutValidator sharedValidator]; _enabled = YES; [self resetShortcutCellStyle]; } |
