Skip to content

Commit dac571e

Browse files
[FIX]MacOS:FileDialog replace FileChooser
1 parent 14cbc5a commit dac571e

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

mode/src/processing/mode/android/SDKDownloader.java

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ private void createInitLayout(SDKUrlHolder downloadUrls) {
708708
addPackage(gc,1,packagesPanel,"SDK PlatformTools: ",downloadUrls.platformToolsVersion);
709709
addPackage(gc,2,packagesPanel,"Android Build Tools: ",downloadUrls.buildToolsVersion);
710710
addPackage(gc,3,packagesPanel,"Android Tools: ",downloadUrls.toolsVersion);
711-
addPackage(gc,4,packagesPanel,"Android Emulator: ",downloadUrls.emulatorVersion);
711+
//faddPackage(gc,4,packagesPanel,"Android Emulator: ",downloadUrls.emulatorVersion);
712712
if(Platform.getName()!="linux") addPackage(gc,5,packagesPanel,"Android Build Tools: ",downloadUrls.haxmVersion);
713713

714714
//SDK_Path selection Panel
@@ -724,11 +724,21 @@ private void createInitLayout(SDKUrlHolder downloadUrls) {
724724
selectPathButton.addActionListener(new ActionListener() {
725725
@Override
726726
public void actionPerformed(ActionEvent e) {
727-
JFileChooser fc = new JFileChooser();
728-
fc.setCurrentDirectory(processing.app.Base.getSketchbookFolder());
729-
fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
730-
fc.showOpenDialog(SDKDownloader.super.rootPane); //To put it on top of the modalDialog
731-
if(fc.getSelectedFile()!=null) locationLabel.setText(fc.getSelectedFile().getAbsolutePath());
727+
if (Platform.isMacOS()){
728+
FileDialog fd = new FileDialog(editor,"Select Download Location", FileDialog.LOAD);
729+
fd.setDirectory(processing.app.Base.getSketchbookFolder().getAbsolutePath());
730+
System.setProperty("apple.awt.fileDialogForDirectories", "true");
731+
fd.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);
732+
fd.setVisible(true);
733+
System.setProperty("apple.awt.fileDialogForDirectories", "false");
734+
} else {
735+
JFileChooser fc = new JFileChooser();
736+
fc.setDialogTitle("Select Download Location");
737+
fc.setCurrentDirectory(processing.app.Base.getSketchbookFolder());
738+
fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
739+
fc.showOpenDialog(SDKDownloader.super.rootPane); //To put it on top of the modalDialog
740+
if (fc.getSelectedFile() != null) locationLabel.setText(fc.getSelectedFile().getAbsolutePath());
741+
}
732742
}
733743
});
734744
downloadPathPanel.add(selectPathButton,BorderLayout.EAST);

0 commit comments

Comments
 (0)