Changeset 1992 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-08-23T23:00:18+02:00 (15 years ago)

Author:

Gubaer

Message:

fixing ToggleDialog - now uses a JDialog instead of a JFrame. Should make setAlwaysOnTop() obsolete.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ExtendedDialog.java (modified) (3 diffs)
• dialogs/ToggleDialog.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.gui;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Component;
@@ -21 +19 @@
 import javax.swing.KeyStroke;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -44 +41 @@
      */
     public ExtendedDialog(Component parent, String title, Component content, String[] buttonTexts, String[] buttonIcons) {
-        super(JOptionPane.getFrameForComponent(parent), title, true);
+        super(JOptionPane.getFrameForComponent(parent), title, true /* modal */);
         this.parent = parent;
         bTexts = buttonTexts;

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -23 +23 @@
 import javax.swing.Box;
 import javax.swing.JButton;
+import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.ImageIcon;
@@ -162 +164 @@
         stickyActionListener = new ActionListener(){
             public void actionPerformed(ActionEvent e) {
-                final JFrame f = new JFrame(name);
+                final JDialog f = new JDialog(JOptionPane.getFrameForComponent(Main.parent),false /* not modal*/);
                 parent.remove(ToggleDialog.this);
                 f.getContentPane().add(ToggleDialog.this);