Changeset 17865 in josm for trunk

Timestamp:

2021-05-06T18:03:12+02:00 (4 years ago)

Author:

simon04

Message:

fix #20204 - Preferences dialog inconsistent scroll pane borders (patch by DevCharly)

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• PreferenceTabbedPane.java (modified) (1 diff)
• display/ColorPreference.java (modified) (1 diff)
• imagery/ImageryPreference.java (modified) (1 diff)
• projection/ProjectionPreference.java (modified) (3 diffs)
• validator/ValidatorTestsPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -261 +261 @@
             this.preferenceSetting = preferencePanel.getTabPreferenceSetting();
             GuiHelper.setDefaultIncrement(this);
+            setBorder(BorderFactory.createEmptyBorder());
         }
 

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -375 +375 @@
         panel.add(colorFilter, GBC.eol().insets(0, 0, 0, 5).fill(HORIZONTAL));
         JScrollPane scrollpane = new JScrollPane(colors);
-        scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         panel.add(scrollpane, GBC.eol().fill(BOTH));
         JPanel buttonPanel = new JPanel(new GridBagLayout());

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -98 +98 @@
 
         p.add(new JPanel(), GBC.eol().fill(BOTH));
-        return GuiHelper.setDefaultIncrement(new JScrollPane(p));
+        JScrollPane scrollPane = new JScrollPane(p);
+        scrollPane.setBorder(BorderFactory.createEmptyBorder());
+        return GuiHelper.setDefaultIncrement(scrollPane);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

@@ -21 +21 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 
@@ -370 +371 @@
         unitsCombo.setSelectedItem(SystemOfMeasurement.getSystemOfMeasurement());
 
-        projPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         projPanel.add(new JLabel(tr("Projection method")), GBC.std().insets(5, 5, 0, 5));
         projPanel.add(GBC.glue(5, 0), GBC.std().fill(GBC.HORIZONTAL));
@@ -414 +414 @@
         projPanel.add(GBC.glue(1, 1), GBC.std().fill(GBC.HORIZONTAL).weight(1.0, 1.0));
 
-        gui.createPreferenceTab(this).add(projPanel.getVerticalScrollPane(), GBC.std().fill());
+        JScrollPane scrollPane = projPanel.getVerticalScrollPane();
+        scrollPane.setBorder(BorderFactory.createEmptyBorder());
+        gui.createPreferenceTab(this).add(scrollPane, GBC.std().fill());
 
         selectedProjectionChanged(pc);

trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreference.java

@@ -15 +15 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 
 import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
@@ -90 +91 @@
         }
 
+        JScrollPane scrollPane = GuiHelper.embedInVerticalScrollPane(testPanel);
+        scrollPane.setBorder(BorderFactory.createEmptyBorder());
         gui.getValidatorPreference().addSubTab(this, tr("Tests"),
-                GuiHelper.embedInVerticalScrollPane(testPanel),
+                scrollPane,
                 tr("Choose tests to enable"));
     }