Skip to content

"Enter" icon in default button only for certain NSInterfaceStyles #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

"Enter" icon in default button only for certain NSInterfaceStyles #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a23a7a
"Enter" icon in default button only for certain NSInterfaceStyles
probonopd Jul 13, 2025
0184385
"Enter" icon in default button only for certain NSInterfaceStyles
probonopd Jul 13, 2025
21ce941
"Enter" icon in default button only for certain NSInterfaceStyles
probonopd Jul 13, 2025
50e186e
"Enter" icon in default button only for certain NSInterfaceStyles
probonopd Jul 13, 2025
5813e93
"Enter" icon in default button only for certain NSInterfaceStyles
probonopd Jul 13, 2025
13a0379
Fix indentation
probonopd Jul 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions Source/GSHelpManagerPanel.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,15 @@ - (id)init
[button setTitle: NSLocalizedString(@"OK", @"")];
[button setKeyEquivalent: @"\r"];
[button setImagePosition: NSImageRight];
[button setImage: [NSImage imageNamed: @"common_ret"]];
[button setAlternateImage: [NSImage imageNamed: @"common_retH"]];
[button setTarget: self];
[button setAction: @selector(buttonAction:)];
NSInterfaceStyle interfaceStyle = NSInterfaceStyleForKey(@"NSInterfaceStyle", nil);
if (interfaceStyle == NSNextStepInterfaceStyle
|| interfaceStyle == GSWindowMakerInterfaceStyle)
{
[button setImage: [NSImage imageNamed: @"common_ret"]];
[button setAlternateImage: [NSImage imageNamed: @"common_retH"]];
}
[button setTarget: self];
[button setAction: @selector(buttonAction:)];

[[self contentView] addSubview: button];
RELEASE (button);
Expand Down
37 changes: 21 additions & 16 deletions Source/GSThemeDrawing.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,22 +102,27 @@ @implementation GSTheme (Drawing)
- (void) setKeyEquivalent: (NSString *)key
forButtonCell: (NSButtonCell *)cell
{
if([cell image] == nil && ([key isEqualToString:@"\r"] ||
[key isEqualToString:@"\n"]))
{
[cell setImagePosition: NSImageRight];
[cell setImage: [NSImage imageNamed:@"common_ret"]];
[cell setAlternateImage: [NSImage imageNamed:@"common_retH"]];
}
else if([key isEqualToString:@"\r"] == NO &&
[key isEqualToString:@"\n"] == NO)
{
NSImage *cellImage = [cell image];
if(cellImage == [NSImage imageNamed:@"common_ret"])
{
[cell setImage: nil];
[cell setAlternateImage: nil];
}
NSInterfaceStyle interfaceStyle = NSInterfaceStyleForKey(@"NSInterfaceStyle", nil);
if (interfaceStyle == NSNextStepInterfaceStyle
|| interfaceStyle == GSWindowMakerInterfaceStyle)
{
if([cell image] == nil && ([key isEqualToString:@"\r"] ||
[key isEqualToString:@"\n"]))
{
[cell setImagePosition: NSImageRight];
[cell setImage: [NSImage imageNamed:@"common_ret"]];
[cell setAlternateImage: [NSImage imageNamed:@"common_retH"]];
}
else if([key isEqualToString:@"\r"] == NO &&
[key isEqualToString:@"\n"] == NO)
{
NSImage *cellImage = [cell image];
if(cellImage == [NSImage imageNamed:@"common_ret"])
{
[cell setImage: nil];
[cell setAlternateImage: nil];
}
}
}
}

Expand Down
9 changes: 7 additions & 2 deletions Source/NSAlert.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,8 +502,13 @@ - (id) _initWithoutGModel
[defButton setHighlightsBy: NSPushInCellMask | NSChangeGrayCellMask
| NSContentsCellMask];
[defButton setImagePosition: NSImageRight];
[defButton setImage: [NSImage imageNamed: @"common_ret"]];
[defButton setAlternateImage: [NSImage imageNamed: @"common_retH"]];
NSInterfaceStyle interfaceStyle = NSInterfaceStyleForKey(@"NSInterfaceStyle", nil);
if (interfaceStyle == NSNextStepInterfaceStyle
|| interfaceStyle == GSWindowMakerInterfaceStyle)
{
[defButton setImage: [NSImage imageNamed: @"common_ret"]];
[defButton setAlternateImage: [NSImage imageNamed: @"common_retH"]];
}

altButton = [self _makeButtonWithRect: rect tag: NSAlertAlternateReturn];
othButton = [self _makeButtonWithRect: rect tag: NSAlertOtherReturn];
Expand Down
11 changes: 8 additions & 3 deletions Source/NSSavePanel.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,14 @@ -(id) _initWithoutGModel
_okButton = [[NSButton alloc] initWithFrame: r];
[_okButton setBordered: YES];
[_okButton setTitle: _(@"OK")];
[_okButton setImagePosition: NSImageRight];
[_okButton setImage: [NSImage imageNamed: @"common_ret"]];
[_okButton setAlternateImage: [NSImage imageNamed: @"common_retH"]];
[_okButton setImagePosition: NSImageRight];
NSInterfaceStyle interfaceStyle = NSInterfaceStyleForKey(@"NSInterfaceStyle", nil);
if (interfaceStyle == NSNextStepInterfaceStyle
|| interfaceStyle == GSWindowMakerInterfaceStyle)
{
[_okButton setImage: [NSImage imageNamed: @"common_ret"]];
[_okButton setAlternateImage: [NSImage imageNamed: @"common_retH"]];
}
[_okButton setTarget: self];
[_okButton setAction: @selector(ok:)];
[_okButton setEnabled: NO];
Expand Down
9 changes: 7 additions & 2 deletions Source/NSSpellChecker.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,8 +709,13 @@ - (void) awakeFromNib
[_correctButton setKeyEquivalent: @"c"];
[_correctButton setKeyEquivalentModifierMask: NSCommandKeyMask];
[_correctButton setImagePosition: NSImageRight];
[_correctButton setImage: [NSImage imageNamed: @"common_ret"]];
[_correctButton setAlternateImage: [NSImage imageNamed: @"common_retH"]];
NSInterfaceStyle interfaceStyle = NSInterfaceStyleForKey(@"NSInterfaceStyle", nil);
if (interfaceStyle == NSNextStepInterfaceStyle
|| interfaceStyle == GSWindowMakerInterfaceStyle)
{
[_correctButton setImage: [NSImage imageNamed: @"common_ret"]];
[_correctButton setAlternateImage: [NSImage imageNamed: @"common_retH"]];
}
[_spellPanel makeFirstResponder: _correctButton];
[_spellPanel setBecomesKeyOnlyIfNeeded: YES];
[_spellPanel setFloatingPanel: YES];
Expand Down