MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-159369 Mac Native File Chooser doesn't open on pressing Browse [...] button; IAE at MacPathChooserDialog.findOwnerByComponent

Browse Source
This commit is contained in:
Denis Fokin
2016-08-03 15:09:00 +03:00
parent f5c5b7a166
commit 8791f08336
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/ui/ComponentWithBrowseButton.java
+1 -1
View File
@@ -256,7 +256,7 @@ public class ComponentWithBrowseButton<Comp extends JComponent> extends JPanel i
}
}
FileChooser.chooseFile(fileChooserDescriptor, getProject(), getInitialFile(), file -> onFileChosen(file));
FileChooser.chooseFile(fileChooserDescriptor, getProject(), myTextComponent, getInitialFile(), this::onFileChosen);
}
@Nullable
platform/platform-impl/src/com/intellij/ui/mac/MacPathChooserDialog.java
+7 -2
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Consumer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -63,10 +64,14 @@ public class MacPathChooserDialog implements PathChooserDialog {
@Override
public void choose(@Nullable VirtualFile toSelect, @NotNull Consumer<List<VirtualFile>> callback) {
myFileDialog.setFile(toSelect.getCanonicalPath());
String path = toSelect != null ? toSelect.getCanonicalPath() : null;
myFileDialog.setFile(path);
myFileDialog.setVisible(true);
callback.consume(getChosenFiles(Stream.of(myFileDialog.getFiles())));
File[] files = myFileDialog.getFiles();
if (!ArrayUtil.isEmpty(files)) {
callback.consume(getChosenFiles(Stream.of(files)));
}
}
@NotNull