Changeset 15802 in josm for trunk

Timestamp:

2020-01-31T00:07:30+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18523 - fix upload dialog layout (patch by taylor.smock)

Location:

trunk/src/org/openstreetmap/josm/gui/io

Files:

• BasicUploadSettingsPanel.java (modified) (2 diffs)
• UploadDialog.java (modified) (1 diff)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.BorderLayout;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -177 +178 @@
 
     protected void build() {
-        setLayout(new GridBagLayout());
+        setLayout(new BorderLayout());
         setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
-        add(buildUploadCommentPanel(), GBC.eol().fill(GBC.BOTH));
-        add(pnlUploadParameterSummary, GBC.eol().fill(GBC.BOTH));
-        add(cbRequestReview, GBC.eol().fill(GBC.BOTH));
+        add(buildUploadCommentPanel(), BorderLayout.NORTH);
+        add(pnlUploadParameterSummary, BorderLayout.CENTER);
+        add(cbRequestReview, BorderLayout.SOUTH);
         cbRequestReview.addItemListener(e -> changesetReviewModel.setReviewRequested(e.getStateChange() == ItemEvent.SELECTED));
     }

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

@@ -433 +433 @@
         @Override
         public Dimension getPreferredSize() {
+            // This probably fixes #18523. Don't know why. Don't know how. It just does.
+            super.getPreferredSize();
             // make sure the tabbed pane never grabs more space than necessary
             return super.getMinimumSize();