stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6614972: JSlider value should not change on right-click

Browse Source 
WindowsSliderUI won't use the right mouse button for change slider position

Reviewed-by: alexp
This commit is contained in:
Pavel Porvatov 2008-04-29 17:48:01 +04:00
parent f5ac15812c
commit f149163508
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
View File

@ -982,7 +982,7 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
"LEFT", "positiveUnitIncrement", "LEFT", "positiveUnitIncrement",
"KP_LEFT", "positiveUnitIncrement", "KP_LEFT", "positiveUnitIncrement",
}), }),
"Slider.onlyLeftMouseButtonDrag", Boolean.FALSE,
"Spinner.ancestorInputMap", "Spinner.ancestorInputMap",
new UIDefaults.LazyInputMap(new Object[] { new UIDefaults.LazyInputMap(new Object[] {

1
jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
View File

@ -1364,6 +1364,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel implements Serializab
"LEFT", "positiveUnitIncrement", "LEFT", "positiveUnitIncrement",
"KP_LEFT", "positiveUnitIncrement", "KP_LEFT", "positiveUnitIncrement",
}), }),
"Slider.onlyLeftMouseButtonDrag", Boolean.TRUE,
// *** Spinner // *** Spinner
"Spinner.font", monospacedPlain12, "Spinner.font", monospacedPlain12,

10
jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
View File

@ -1573,6 +1573,11 @@ public class BasicSliderUI extends SliderUI{
// Clicked in the Thumb area? // Clicked in the Thumb area?
if (thumbRect.contains(currentMouseX, currentMouseY)) { if (thumbRect.contains(currentMouseX, currentMouseY)) {
if (UIManager.getBoolean("Slider.onlyLeftMouseButtonDrag")
&& !SwingUtilities.isLeftMouseButton(e)) {
return;
}
switch (slider.getOrientation()) { switch (slider.getOrientation()) {
case JSlider.VERTICAL: case JSlider.VERTICAL:
offset = currentMouseY - thumbRect.y; offset = currentMouseY - thumbRect.y;
@ -1584,6 +1589,11 @@ public class BasicSliderUI extends SliderUI{
isDragging = true; isDragging = true;
return; return;
} }
if (!SwingUtilities.isLeftMouseButton(e)) {
return;
}
isDragging = false; isDragging = false;
slider.setValueIsAdjusting(true); slider.setValueIsAdjusting(true);