Changeset 9778 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-02-10T20:47:11+01:00 (8 years ago)

Author:

bastiK

Message:

see #12507 - fix mouse wheel scrolling at some places

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/MapPaintDialog.java (modified) (1 diff)
• preferences/audio/AudioPreference.java (modified) (2 diffs)
• preferences/display/DrawingPreference.java (modified) (3 diffs)
• preferences/display/LafPreference.java (modified) (4 diffs)
• preferences/imagery/AddWMSLayerPanel.java (modified) (1 diff)
• preferences/imagery/ImageryPreference.java (modified) (1 diff)
• preferences/projection/ProjectionPreference.java (modified) (3 diffs)
• preferences/remotecontrol/RemoteControlPreference.java (modified) (2 diffs)
• preferences/validator/ValidatorTestsPreference.java (modified) (2 diffs)
• util/GuiHelper.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -176 +176 @@
 
         JScrollPane sp = new JScrollPane(p);
-        // putting JTable directly in a JScrollPane works nicely, but with
-        // JPanel wrapper, the default scroll increment is too small
-        sp.getVerticalScrollBar().setUnitIncrement(16);
+        GuiHelper.setDefaultIncrement(sp);
         createLayout(sp, false, Arrays.asList(
                 new SideButton(onoffAction, false),

trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -56 +57 @@
     @Override
     public void addGui(PreferenceTabbedPane gui) {
-        JPanel audio = new JPanel(new GridBagLayout());
+        JPanel audio = new VerticallyScrollablePanel(new GridBagLayout());
 
         // audioMenuVisible

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

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -64 +65 @@
         JScrollPane scrollpane = new JScrollPane(panel);
         scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        GuiHelper.setDefaultIncrement(scrollpane);
         gui.getDisplayPreference().addSubTab(this, tr("GPS Points"), scrollpane);
         panel = new JPanel(new GridBagLayout());
@@ -167 +169 @@
         scrollpane = new JScrollPane(panel);
         scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        GuiHelper.setDefaultIncrement(scrollpane);
         gui.getDisplayPreference().addSubTab(this, tr("OSM Data"), scrollpane);
     }

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

@@ -32 +32 @@
 import org.openstreetmap.josm.gui.widgets.FileChooserManager;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
+import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -54 +55 @@
      */
     private JosmComboBox<LookAndFeelInfo> lafCombo;
-    JPanel panel;
+    VerticallyScrollablePanel panel;
     private final JCheckBox showSplashScreen = new JCheckBox(tr("Show splash screen at startup"));
     private final JCheckBox showID = new JCheckBox(tr("Show object ID in selection lists"));
@@ -99 +100 @@
         });
 
-        panel = new JPanel(new GridBagLayout());
+        panel = new VerticallyScrollablePanel(new GridBagLayout());
         panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 
@@ -147 +148 @@
         panel.add(lafCombo, GBC.eol().fill(GBC.HORIZONTAL));
 
-        JScrollPane scrollpane = new JScrollPane(panel);
+        JScrollPane scrollpane = panel.getVerticalScrollPane();
         scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         gui.getDisplayPreference().addSubTab(this, tr("Look and Feel"), scrollpane);

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

@@ -61 +61 @@
 
         showBounds.setEnabled(false);
-        add(new JScrollPane(showBounds), GBC.eop().fill());
+        add(showBounds, GBC.eop().fill());
 
         add(new JLabel(tr("3. Select image format")), GBC.eol());

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

@@ -121 +121 @@
 
         p.add(new JPanel(), GBC.eol().fill(GBC.BOTH));
-        return new JScrollPane(p);
+        return GuiHelper.setDefaultIncrement(new JScrollPane(p));
     }
 

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

@@ -36 +36 @@
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
+import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -292 +293 @@
      * This is the panel holding all projection preferences
      */
-    private final JPanel projPanel = new JPanel(new GridBagLayout());
+    private final VerticallyScrollablePanel projPanel = new VerticallyScrollablePanel(new GridBagLayout());
 
     /**
@@ -346 +347 @@
         projPanel.add(GBC.glue(1, 1), GBC.std().fill(GBC.HORIZONTAL).weight(1.0, 1.0));
 
-        JScrollPane scrollpane = new JScrollPane(projPanel);
-        gui.getMapPreference().addSubTab(this, tr("Map Projection"), scrollpane);
+        gui.getMapPreference().addSubTab(this, tr("Map Projection"), projPanel.getVerticalScrollPane());
 
         selectedProjectionChanged(pc);

trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java

@@ -34 +34 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
 import org.openstreetmap.josm.io.remotecontrol.RemoteControl;
@@ -81 +82 @@
     public void addGui(final PreferenceTabbedPane gui) {
 
-        JPanel remote = new JPanel(new GridBagLayout());
+        JPanel remote = new VerticallyScrollablePanel(new GridBagLayout());
 
         final JLabel descLabel = new JLabel("<html>"

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

@@ -27 +27 @@
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -55 +56 @@
     @Override
     public void addGui(PreferenceTabbedPane gui) {
-        JPanel testPanel = new JPanel(new GridBagLayout());
+        JPanel testPanel = new VerticallyScrollablePanel(new GridBagLayout());
         testPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 

trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java

@@ -37 +37 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.Scrollable;
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
@@ -341 +342 @@
 
     /**
+     * Set the default unit increment for a {@code JScrollPane}.
+     *
+     * This fixes slow mouse wheel scrolling when the content of the {@code JScrollPane}
+     * is a {@code JPanel} or other component that does not implement the {@link Scrollable}
+     * interface.
+     * The default unit increment is 1 pixel. Multiplied by the number of unit increments
+     * per mouse wheel "click" (platform dependent, usually 3), this makes a very
+     * sluggish mouse wheel experience.
+     * This methods sets the unit increment to a larger, more reasonable value.
+     * @param sp the scroll pane
+     * @return the scroll pane (same object) with fixed unit increment
+     * @throws IllegalArgumentException if the component inside of the scroll pane
+     * implements the {@code Scrollable} interface ({@code JTree}, {@code JLayer},
+     * {@code JList}, {@code JTextComponent} and {@code JTable})
+     */
+    public static JScrollPane setDefaultIncrement(JScrollPane sp) {
+        if (sp.getViewport().getView() instanceof Scrollable) {
+            throw new IllegalArgumentException();
+        }
+        sp.getVerticalScrollBar().setUnitIncrement(10);
+        sp.getHorizontalScrollBar().setUnitIncrement(10);
+        return sp;
+    }
+
+    /**
      * Returns extended modifier key used as the appropriate accelerator key for menu shortcuts.
      * It is advised everywhere to use {@link Toolkit#getMenuShortcutKeyMask()} to get the cross-platform modifier, but: