Ticket #20204: JOSM-preferences-borders-fix.diff

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

@@ -373 +373 @@
         panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         panel.add(colorFilter, GBC.eol().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());
         panel.add(buttonPanel, GBC.eol().insets(5, 0, 5, 5).fill(HORIZONTAL));

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

@@ -20 +20 @@
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 
 import org.openstreetmap.josm.actions.ExpertToggleAction;
@@ -368 +369 @@
 
         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));
         projPanel.add(projectionCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0, 5, 5, 5));
@@ -412 +412 @@
         projPanel.add(unitsCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0, 5, 5, 5));
         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);
     }

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

@@ -97 +97 @@
         addSettingsSection(p, tr("TMS Settings"), tmsSettings, GBC.eol().fill(HORIZONTAL));
 
         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);
     }
 
     @Override

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

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

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

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