diff options
3 files changed, 12 insertions, 1 deletions
diff --git a/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java b/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java index b4f435798..31077b14f 100644 --- a/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java +++ b/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java @@ -982,7 +982,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel { "LEFT", "positiveUnitIncrement", "KP_LEFT", "positiveUnitIncrement", }), - + "Slider.onlyLeftMouseButtonDrag", Boolean.FALSE, "Spinner.ancestorInputMap", new UIDefaults.LazyInputMap(new Object[] { diff --git a/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java b/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java index 77f46be88..f051b8063 100644 --- a/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java +++ b/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java @@ -1364,6 +1364,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel implements Serializab "LEFT", "positiveUnitIncrement", "KP_LEFT", "positiveUnitIncrement", }), + "Slider.onlyLeftMouseButtonDrag", Boolean.TRUE, // *** Spinner "Spinner.font", monospacedPlain12, diff --git a/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java b/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java index 70f5cba3b..3203df334 100644 --- a/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java +++ b/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java @@ -1573,6 +1573,11 @@ public class BasicSliderUI extends SliderUI{ // Clicked in the Thumb area? if (thumbRect.contains(currentMouseX, currentMouseY)) { + if (UIManager.getBoolean("Slider.onlyLeftMouseButtonDrag") + && !SwingUtilities.isLeftMouseButton(e)) { + return; + } + switch (slider.getOrientation()) { case JSlider.VERTICAL: offset = currentMouseY - thumbRect.y; @@ -1584,6 +1589,11 @@ public class BasicSliderUI extends SliderUI{ isDragging = true; return; } + + if (!SwingUtilities.isLeftMouseButton(e)) { + return; + } + isDragging = false; slider.setValueIsAdjusting(true); |