6614972: JSlider value should not change on right-click

Summary: WindowsSliderUI won't use the right mouse button for change slider position
Reviewed-by: alexp

2 files changed, 11 insertions, 0 deletions

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);