Set window’s defaultButtonCell

This is instead of setting the key equivalent to ‘\r’ for the button that should be default.
This commit is contained in:
Allan Odgaard
2013-03-13 12:37:22 +01:00
parent c44e85f258
commit b5136bcdc7

View File

@@ -261,7 +261,6 @@ static NSButton* OakCreateButton (NSString* label, NSBezelStyle bezel = NSRounde
self.findPreviousButton = OakCreateButton(@"Previous");
self.findNextButton = OakCreateButton(@"Next");
self.findNextButton.keyEquivalent = @"\r";
[self updateSearchInPopUpMenu];
// =============================
@@ -332,6 +331,9 @@ static NSButton* OakCreateButton (NSString* label, NSBezelStyle bezel = NSRounde
[self updateConstraints];
self.window.initialFirstResponder = self.findTextField;
self.window.defaultButtonCell = self.findNextButton.cell;
self.searchIn = FFSearchInDocument;
// setup find/replace strings/options
@@ -472,7 +474,6 @@ static NSButton* OakCreateButton (NSString* label, NSBezelStyle bezel = NSRounde
[self.window.contentView addConstraints:_myConstraints];
self.window.initialFirstResponder = self.findTextField;
if(self.showsResultsOutlineView)
{
NSView* keyViewLoop[] = { self.findTextField, self.replaceTextField, self.globTextField, self.actionsPopUpButton, self.countButton, self.regularExpressionCheckBox, self.ignoreWhitespaceCheckBox, self.ignoreCaseCheckBox, self.wrapAroundCheckBox, self.wherePopUpButton, self.resultsOutlineView, self.findAllButton, self.replaceAllButton, self.replaceAndFindButton, self.findPreviousButton, self.findNextButton };
@@ -786,8 +787,7 @@ static NSButton* OakCreateButton (NSString* label, NSBezelStyle bezel = NSRounde
[self.window setFrame:windowFrame display:YES];
}
self.findAllButton.keyEquivalent = flag ? @"\r" : @"";
self.findNextButton.keyEquivalent = flag ? @"" : @"\r";
self.window.defaultButtonCell = flag ? self.findAllButton.cell : self.findNextButton.cell;
}
- (void)setDisableResultsCheckBoxes:(BOOL)flag