Changeset 7375 in josm for trunk/src/org

Timestamp:

2014-08-10T14:52:11+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10362 - wrong layout in advanced tab of upload dialog (regression from r6901)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• io/UploadDialog.java (modified) (1 diff)
• io/UploadStrategySelectionPanel.java (modified) (6 diffs)
• widgets/JosmTextField.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -233 +233 @@
                 }
         );
+
+        setMinimumSize(new Dimension(300, 350));
 
         Main.pref.addPreferenceChangeListener(this);

trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

@@ -105 +105 @@
         gc.gridx = 1;
         gc.gridy = 1;
-        gc.weightx = 0.0;
+        gc.weightx = 1.0;
         gc.weighty = 0.0;
         gc.gridwidth = 2;
@@ -113 +113 @@
         gc.gridx = 3;
         gc.gridy = 1;
-        gc.weightx = 1.0;
+        gc.weightx = 0.0;
         gc.weighty = 0.0;
         gc.gridwidth = 1;
@@ -126 +126 @@
         gc.gridx = 1;
         gc.gridy = 2;
-        gc.weightx = 0.0;
+        gc.weightx = 1.0;
         gc.weighty = 0.0;
         gc.gridwidth = 1;
@@ -140 +140 @@
         gc.gridx = 3;
         gc.gridy = 2;
-        gc.weightx = 1.0;
+        gc.weightx = 0.0;
         gc.weighty = 0.0;
         gc.gridwidth = 1;
@@ -153 +153 @@
         gc.gridx = 1;
         gc.gridy = 3;
-        gc.weightx = 0.0;
+        gc.weightx = 1.0;
         gc.weighty = 0.0;
         gc.gridwidth = 2;
@@ -161 +161 @@
         gc.gridx = 3;
         gc.gridy = 3;
-        gc.weightx = 1.0;
+        gc.weightx = 0.0;
         gc.weighty = 0.0;
         gc.gridwidth = 1;

trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java

@@ -30 +30 @@
         super(doc, text, columns);
         TextContextualPopupMenu.enableMenuFor(this);
+        // Fix minimum size when columns are specified
+        if (columns > 0) {
+            setMinimumSize(getPreferredSize());
+        }
     }