Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-06 22:10:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

System File Chooser:

Browse Source 
- always use some window as owner (similar to `JFileChooser`)
- Linux: use "Select" for approve button in directory selection
This commit is contained in:
Karl Tauber
2025-01-23 19:52:39 +01:00
parent 112116556d
commit 54d6959533
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemFileChooser.java
View File

@@ -17,6 +17,7 @@
package com.formdev.flatlaf.util; package com.formdev.flatlaf.util;
import java.awt.Component; import java.awt.Component;
import java.awt.KeyboardFocusManager;
import java.awt.SecondaryLoop; import java.awt.SecondaryLoop;
import java.awt.Toolkit; import java.awt.Toolkit;
import java.awt.Window; import java.awt.Window;
@@ -617,8 +618,14 @@ public class SystemFileChooser
} }
private int showDialogImpl( Component parent ) { private int showDialogImpl( Component parent ) {
Window owner = (parent instanceof Window)
? (Window) parent
: (parent != null) ? SwingUtilities.windowForComponent( parent ) : null;
if( owner == null )
owner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow();
approveResult = APPROVE_OPTION; approveResult = APPROVE_OPTION;
File[] files = getProvider().showDialog( parent, this ); File[] files = getProvider().showDialog( owner, this );
setSelectedFiles( files ); setSelectedFiles( files );
return (files != null) ? approveResult : CANCEL_OPTION; return (files != null) ? approveResult : CANCEL_OPTION;
} }
@@ -640,7 +647,7 @@ public class SystemFileChooser
//---- interface FileChooserProvider -------------------------------------- //---- interface FileChooserProvider --------------------------------------
private interface FileChooserProvider { private interface FileChooserProvider {
File[] showDialog( Component parent, SystemFileChooser fc ); File[] showDialog( Window owner, SystemFileChooser fc );
} }
//---- class SystemFileChooserProvider ------------------------------------ //---- class SystemFileChooserProvider ------------------------------------
@@ -649,10 +656,7 @@ public class SystemFileChooser
implements FileChooserProvider implements FileChooserProvider
{ {
@Override @Override
public File[] showDialog( Component parent, SystemFileChooser fc ) { public File[] showDialog( Window owner, SystemFileChooser fc ) {
Window owner = (parent instanceof Window)
? (Window) parent
: (parent != null) ? SwingUtilities.windowForComponent( parent ) : null;
AtomicReference<String[]> filenamesRef = new AtomicReference<>(); AtomicReference<String[]> filenamesRef = new AtomicReference<>();
// create secondary event look and invoke system file dialog on a new thread // create secondary event look and invoke system file dialog on a new thread
@@ -667,7 +671,7 @@ public class SystemFileChooser
// fallback to Swing file chooser if system file dialog failed or is not available // fallback to Swing file chooser if system file dialog failed or is not available
if( filenames == null ) if( filenames == null )
return new SwingFileChooserProvider().showDialog( parent, fc ); return new SwingFileChooserProvider().showDialog( owner, fc );
// canceled? // canceled?
if( filenames.length == 0 ) if( filenames.length == 0 )
@@ -1068,7 +1072,7 @@ public class SystemFileChooser
implements FileChooserProvider implements FileChooserProvider
{ {
@Override @Override
public File[] showDialog( Component parent, SystemFileChooser fc ) { public File[] showDialog( Window owner, SystemFileChooser fc ) {
JFileChooser chooser = new JFileChooser() { JFileChooser chooser = new JFileChooser() {
@Override @Override
public void approveSelection() { public void approveSelection() {
@@ -1139,7 +1143,7 @@ public class SystemFileChooser
chooser.setCurrentDirectory( fc.getCurrentDirectory() ); chooser.setCurrentDirectory( fc.getCurrentDirectory() );
chooser.setSelectedFile( fc.getSelectedFile() ); chooser.setSelectedFile( fc.getSelectedFile() );
if( chooser.showDialog( parent, null ) != JFileChooser.APPROVE_OPTION ) if( chooser.showDialog( owner, null ) != JFileChooser.APPROVE_OPTION )
return null; return null;
return chooser.isMultiSelectionEnabled() return chooser.isMultiSelectionEnabled()

3
flatlaf-natives/flatlaf-natives-linux/src/main/cpp/GtkFileChooser.cpp
View File

@@ -194,7 +194,8 @@ JNIEXPORT jobjectArray JNICALL Java_com_formdev_flatlaf_ui_FlatNativeLinuxLibrar
selectFolder ? GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER selectFolder ? GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
: (open ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE), : (open ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE),
_("_Cancel"), GTK_RESPONSE_CANCEL, _("_Cancel"), GTK_RESPONSE_CANCEL,
(cokButtonLabel != NULL) ? cokButtonLabel : (open ? _("_Open") : _("_Save")), GTK_RESPONSE_ACCEPT, (cokButtonLabel != NULL) ? cokButtonLabel
: (selectFolder ? _("_Select") : (open ? _("_Open") : _("_Save"))), GTK_RESPONSE_ACCEPT,
NULL ); // marks end of buttons NULL ); // marks end of buttons
GtkFileChooser* chooser = GTK_FILE_CHOOSER( dialog ); GtkFileChooser* chooser = GTK_FILE_CHOOSER( dialog );