From 773e8d3714ff234731a50522360a40bb3d6df0a4 Mon Sep 17 00:00:00 2001 From: alirana01 Date: Thu, 23 Mar 2023 13:14:59 +0100 Subject: [PATCH 1/2] IEP-911: Changing the shell variable to default display shell as the active display and window can be different --- .../com/espressif/idf/ui/update/DirectorySelectionDialog.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/DirectorySelectionDialog.java b/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/DirectorySelectionDialog.java index eeb1a641f..92e7fe1eb 100644 --- a/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/DirectorySelectionDialog.java +++ b/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/DirectorySelectionDialog.java @@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.DirectoryDialog; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; @@ -105,7 +106,7 @@ public void modifyText(ModifyEvent e) @Override public void widgetSelected(SelectionEvent event) { - DirectoryDialog dlg = new DirectoryDialog(shell); + DirectoryDialog dlg = new DirectoryDialog(Display.getDefault().getActiveShell()); dlg.setFilterPath(text.getText()); dlg.setText(Messages.DirectorySelectionDialog_IDFDirLabel); dlg.setMessage(Messages.DirectorySelectionDialog_SelectIDFDirMessage); From b2a224f896c04290fe616155333b79090021b392 Mon Sep 17 00:00:00 2001 From: alirana01 Date: Thu, 23 Mar 2023 13:57:32 +0100 Subject: [PATCH 2/2] IEP-911: Changes for python buttons --- .../com/espressif/idf/ui/update/DirectorySelectionDialog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/DirectorySelectionDialog.java b/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/DirectorySelectionDialog.java index 92e7fe1eb..d5a64daba 100644 --- a/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/DirectorySelectionDialog.java +++ b/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/DirectorySelectionDialog.java @@ -142,7 +142,7 @@ public void modifyText(ModifyEvent e) @Override public void widgetSelected(SelectionEvent event) { - FileDialog dlg = new FileDialog(shell); + FileDialog dlg = new FileDialog(Display.getDefault().getActiveShell()); dlg.setText(Messages.DirectorySelectionDialog_GitExecutableLocation); String dir = dlg.open(); @@ -193,7 +193,7 @@ public void modifyText(ModifyEvent e) @Override public void widgetSelected(SelectionEvent event) { - FileDialog dlg = new FileDialog(shell); + FileDialog dlg = new FileDialog(Display.getDefault().getActiveShell()); dlg.setText(Messages.DirectorySelectionDialog_PyExecutableLocation); String dir = dlg.open();