imports/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-04-02 05:27:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

System File Chooser: macOS: Cmd+A (**Select All**) did not work in file dialog (issue #1084)

Browse Source
This commit is contained in:
Karl Tauber
2026-04-01 11:48:56 +02:00
parent ca2f6a1222
commit b1c987afaa
2 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -3,6 +3,8 @@ FlatLaf Change Log
## 3.7.2-SNAPSHOT
- System File Chooser:
- macOS: `Cmd+A` (**Select All**) did not work in file dialog. (issue #1084)
- macOS: Fixed missing close/iconify/maximize buttons on inactive window, if
system appearance is dark, but application appearance is light. (issue #1032)

58
flatlaf-natives/flatlaf-natives-macos/src/main/objcpp/MacFileChooser.mm
View File

@@ -212,14 +212,68 @@ static NSArray* getDialogURLs( NSSavePanel* dialog );
int count = [mainMenu numberOfItems];
for( int i = 0; i < count; i++ ) {
NSMenuItem* menuItem = [mainMenu itemAtIndex:i];
NSMenu *subenu = [menuItem submenu];
if( [subenu isJavaMenu] )
NSMenu *submenu = [menuItem submenu];
if( [submenu isJavaMenu] )
[menuItem setEnabled:NO];
}
// "Select All (Cmd+A)" in file dialog requires that a menu item
// with "selectAll:" selector exists in main menu bar.
// change action of (disabled) Swing "Select All" menu item (if exists) to "selectAll:"
NSMenuItem* swingSelectAllItem = [self findSelectAllMenuItem:mainMenu];
if( swingSelectAllItem != nil )
swingSelectAllItem.action = @selector(selectAll:);
// add invisible "Select All" menu item to application menu
NSMenuItem *selectAllItem = [[NSMenuItem alloc] initWithTitle:@""
action:@selector(selectAll:) keyEquivalent:@"a"];
selectAllItem.keyEquivalentModifierMask = NSEventModifierFlagCommand;
selectAllItem.target = nil; // use responder chain
selectAllItem.view = [[NSView alloc] initWithFrame:NSMakeRect( 0, 0, 1, 1 )];
NSMenu* appMenu = [[mainMenu itemAtIndex:0] submenu];
[appMenu addItem:selectAllItem];
JNI_COCOA_CATCH()
}
- (void) windowDidResignMain:(NSNotification *) notification {
JNI_COCOA_TRY()
NSMenu* mainMenu = [NSApp mainMenu];
// remove invisible "Select All" menu item from application menu
NSMenu* appMenu = [[mainMenu itemAtIndex:0] submenu];
int lastIndex = appMenu.numberOfItems - 1;
NSMenuItem* mi = [appMenu itemAtIndex:lastIndex];
if( mi.keyEquivalentModifierMask == NSEventModifierFlagCommand && [@"a" isEqual:mi.keyEquivalent] )
[appMenu removeItemAtIndex:lastIndex];
// restore Swing "Select All" action
NSMenuItem* swingSelectAllItem = [self findSelectAllMenuItem:mainMenu];
if( swingSelectAllItem != nil )
swingSelectAllItem.action = @selector(handleAction:);
JNI_COCOA_CATCH()
}
- (NSMenuItem*) findSelectAllMenuItem:(NSMenu *) menu {
int count = [menu numberOfItems];
for( int i = 0; i < count; i++ ) {
NSMenuItem* mi = [menu itemAtIndex:i];
if( mi.keyEquivalentModifierMask == NSEventModifierFlagCommand && [@"a" isEqual:mi.keyEquivalent] )
return mi;
if( mi.hasSubmenu ) {
NSMenuItem* mi2 = [self findSelectAllMenuItem:mi.submenu];
if( mi2 != nil )
return mi2;
}
}
return nil;
}
@end
//---- helper -----------------------------------------------------------------