Changeset 17097 in josm

Timestamp:

2020-10-07T19:49:00+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19876: Preference dialog only shows Advanced Preferences
Use SwingUtilities.invokeLater() so that dialog is completely build before last tab or wanted tab is restored

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/PreferencesAction.java (modified) (2 diffs)
• gui/preferences/PreferenceDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.gui.MainApplication;
@@ -105 +107 @@
     public void run() {
         final PreferenceDialog p = new PreferenceDialog(MainApplication.getMainFrame());
-        if (tab != null) {
-            p.selectPreferencesTabByClass(tab);
-        } else if (subTab != null) {
-            p.selectSubPreferencesTabByClass(subTab);
-        } else {
-            p.selectPreviouslySelectedPreferences();
-        }
+        SwingUtilities.invokeLater(() -> {
+            if (tab != null) {
+                p.selectPreferencesTabByClass(tab);
+            } else if (subTab != null) {
+                p.selectSubPreferencesTabByClass(subTab);
+            } else {
+                p.selectPreviouslySelectedPreferences();
+            }
+        });
         p.setVisible(true);
     }

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -230 +230 @@
         previouslySelected = tpPreferences.getSelectedTab();
         removeWindowListener(windowEventHandler);
+        setVisible(false); // save current geometry
         super.dispose();
     }