Changeset 16914 in josm

Timestamp:

2020-08-23T17:23:26+02:00 (5 years ago)

Author:

simon04

Message:

see #19699 - OSMDownloadSource: left align, improve spacing

File:

• trunk/src/org/openstreetmap/josm/gui/download/OSMDownloadSource.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/download/OSMDownloadSource.java

@@ -7 +7 @@
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.GridBagLayout;
@@ -213 +214 @@
                     dialog.getSelectedDownloadArea().ifPresent(this::updateSizeCheck);
 
-            // adding the download tasks
-            add(new JLabel(tr(DATA_SOURCES_AND_TYPES)), GBC.std().insets(5, 5, 1, 5).anchor(GBC.CENTER));
-            Font labelFont = sizeCheck.getFont();
-            sizeCheck.setFont(labelFont.deriveFont(Font.PLAIN, labelFont.getSize()));
-
-            downloadSourcesPanel = new JPanel();
-            add(downloadSourcesPanel, GBC.eol().anchor(GBC.EAST));
+            downloadSourcesPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+            add(downloadSourcesPanel, GBC.eol().fill(GBC.HORIZONTAL));
             updateSources();
-            add(sizeCheck, GBC.eol().anchor(GBC.EAST).insets(5, 5, 5, 2));
+
+            sizeCheck.setFont(sizeCheck.getFont().deriveFont(Font.PLAIN));
+            JPanel sizeCheckPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+            sizeCheckPanel.add(sizeCheck);
+            add(sizeCheckPanel, GBC.eol().fill(GBC.HORIZONTAL));
 
             setMinimumSize(new Dimension(450, 115));
@@ -231 +231 @@
         protected void updateSources() {
             downloadSourcesPanel.removeAll();
+            downloadSourcesPanel.add(new JLabel(tr(DATA_SOURCES_AND_TYPES)));
             DOWNLOAD_SOURCES
-                .forEach(obj -> downloadSourcesPanel.add(obj.getCheckBox(checkboxChangeListener), GBC.std().insets(1, 5, 1, 5)));
+                .forEach(obj -> downloadSourcesPanel.add(obj.getCheckBox(checkboxChangeListener)));
         }