Changeset 7407 in josm for trunk

Timestamp:

2014-08-15T22:50:14+02:00 (10 years ago)

Author:

Don-vip

Message:

fix focus issues (regression from r7401)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/ExtendedDialog.java (modified) (3 diffs)
• tools/BugReportExceptionHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

@@ -88 +88 @@
     private Icon icon;
     private boolean modal;
+    private boolean focusOnDefaultButton = false;
 
     /** true, if the dialog should include a help button */
@@ -278 +279 @@
             getRootPane().setDefaultButton(defaultButton);
         }
-        fixFocus();
+        // Don't focus the "do not show this again" check box, but the default button.
+        if (toggleable || focusOnDefaultButton) {
+            requestFocusToDefaultButton();
+        }
         setVisible(true);
         toggleSaveState();
@@ -558 +562 @@
 
     /**
-     * Always makes sure the default button has initial focus.
-     */
-    protected void fixFocus() {
+     * Makes default button request initial focus or not.
+     * @param focus {@code true} to make default button request initial focus
+     * @since 7407
+     */
+    public void setFocusOnDefaultButton(boolean focus) {
+        focusOnDefaultButton = focus;
+    }
+
+    private void requestFocusToDefaultButton() {
         if (defaultButton != null) {
             GuiHelper.runInEDT(new Runnable() {

trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

@@ -106 +106 @@
                         }
                         ed.setContent(pnl);
+                        ed.setFocusOnDefaultButton(true);
                         ed.showDialog();
                         if (cbSuppress != null && cbSuppress.isSelected()) {