infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-03 04:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

8033000: No Horizontal Mouse Wheel Support In

Browse Source 
Reviewed-by: serb, azvegint
This commit is contained in:
Alexander Scherbatiy 2015-03-25 16:31:05 +04:00
parent a5bc56dcec
commit a76b85f2bb
3 changed files with 170 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollPaneUI.java
View File

@ -29,6 +29,7 @@ import java.awt.event.*;
import javax.swing.*;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicScrollPaneUI;
public class AquaScrollPaneUI extends javax.swing.plaf.basic.BasicScrollPaneUI {
public static ComponentUI createUI(final JComponent x) {
@ -39,28 +40,9 @@ public class AquaScrollPaneUI extends javax.swing.plaf.basic.BasicScrollPaneUI {
return new XYMouseWheelHandler();
}
// This is a grody hack to trick BasicScrollPaneUI into scrolling horizontally
// when we notice that the shift key is down. This should be removed when AWT/Swing
// becomes aware of multi-axis scroll wheels.
protected class XYMouseWheelHandler extends javax.swing.plaf.basic.BasicScrollPaneUI.MouseWheelHandler {
protected class XYMouseWheelHandler extends BasicScrollPaneUI.MouseWheelHandler {
public void mouseWheelMoved(final MouseWheelEvent e) {
JScrollBar vScrollBar = null;
boolean wasVisible = false;
if (e.isShiftDown()) {
vScrollBar = scrollpane.getVerticalScrollBar();
if (vScrollBar != null) {
wasVisible = vScrollBar.isVisible();
vScrollBar.setVisible(false);
}
}
super.mouseWheelMoved(e);
if (wasVisible) {
vScrollBar.setVisible(true);
}
// Consume the event even when the scrollBar is invisible
// see #7124320
e.consume();

6
jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
View File

@ -962,6 +962,12 @@ public class BasicScrollPaneUI
return;
}
orientation = SwingConstants.HORIZONTAL;
} else if(e.isShiftDown()){
JScrollBar hScroll = scrollpane.getHorizontalScrollBar();
if (hScroll != null && hScroll.isVisible()) {
toScroll = hScroll;
orientation = SwingConstants.HORIZONTAL;
}
}
e.consume();

162
jdk/test/javax/swing/JScrollPane/8033000/bug8033000.java Normal file
View File

@ -0,0 +1,162 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.awt.BorderLayout;
import java.awt.Point;
import java.awt.Robot;
import java.awt.event.KeyEvent;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import jdk.testlibrary.OSInfo;
/**
* @test
* @bug 8033000
* @author Alexander Scherbatiy
* @summary No Horizontal Mouse Wheel Support In BasicScrollPaneUI
* @library ../../../../lib/testlibrary
* @build jdk.testlibrary.OSInfo
* @run main bug8033000
*/
public class bug8033000 {
private static JScrollPane scrollPane;
private static JTextArea textArea;
private static Point point;
private static final int delta;
static {
delta = OSInfo.getOSType().equals(OSInfo.OSType.MACOSX) ? -30 : 30;
}
public static void main(String[] args) throws Exception {
Robot robot = new Robot();
robot.setAutoDelay(50);
SwingUtilities.invokeAndWait(bug8033000::createAndShowGUI);
robot.waitForIdle();
SwingUtilities.invokeAndWait(() -> {
Point locationOnScreen = scrollPane.getLocationOnScreen();
point = new Point(
locationOnScreen.x + scrollPane.getWidth() / 2,
locationOnScreen.y + scrollPane.getHeight() / 2);
});
robot.mouseMove(point.x, point.y);
robot.waitForIdle();
// vertical scroll bar is enabled
initScrollPane(true, false);
robot.waitForIdle();
robot.mouseWheel(delta);
robot.waitForIdle();
checkScrollPane(true);
// vertical scroll bar is enabled + shift
initScrollPane(true, false);
robot.waitForIdle();
robot.keyPress(KeyEvent.VK_SHIFT);
robot.mouseWheel(delta);
robot.keyRelease(KeyEvent.VK_SHIFT);
robot.waitForIdle();
checkScrollPane(true);
// horizontal scroll bar is enabled
initScrollPane(false, true);
robot.waitForIdle();
robot.mouseWheel(delta);
robot.waitForIdle();
checkScrollPane(false);
// horizontal scroll bar is enabled + shift
initScrollPane(false, true);
robot.waitForIdle();
robot.keyPress(KeyEvent.VK_SHIFT);
robot.mouseWheel(delta);
robot.keyRelease(KeyEvent.VK_SHIFT);
robot.waitForIdle();
checkScrollPane(false);
// both scroll bars are enabled
initScrollPane(true, true);
robot.waitForIdle();
robot.mouseWheel(delta);
robot.waitForIdle();
checkScrollPane(true);
// both scroll bars are enabled + shift
initScrollPane(true, true);
robot.waitForIdle();
robot.keyPress(KeyEvent.VK_SHIFT);
robot.mouseWheel(delta);
robot.keyRelease(KeyEvent.VK_SHIFT);
robot.waitForIdle();
checkScrollPane(false);
}
static void initScrollPane(boolean vVisible, boolean hVisible) throws Exception {
SwingUtilities.invokeAndWait(() -> {
scrollPane.getVerticalScrollBar().setValue(0);
scrollPane.getHorizontalScrollBar().setValue(0);
textArea.setRows(vVisible ? 100 : 1);
textArea.setColumns(hVisible ? 100 : 1);
scrollPane.getVerticalScrollBar().setVisible(vVisible);
scrollPane.getHorizontalScrollBar().setVisible(hVisible);
});
}
static void checkScrollPane(boolean verticalScrolled) throws Exception {
SwingUtilities.invokeAndWait(() -> {
if (verticalScrolled) {
if (scrollPane.getVerticalScrollBar().getValue() == 0
|| scrollPane.getHorizontalScrollBar().getValue() != 0) {
throw new RuntimeException("Wrong vertical scrolling!");
}
} else {
if (scrollPane.getVerticalScrollBar().getValue() != 0
|| scrollPane.getHorizontalScrollBar().getValue() == 0) {
throw new RuntimeException("Wrong horizontal scrolling!");
}
}
});
}
static void createAndShowGUI() {
JFrame frame = new JFrame();
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
frame.setSize(300, 300);
textArea = new JTextArea("Hello World!");
scrollPane = new JScrollPane(textArea);
JPanel panel = new JPanel(new BorderLayout());
panel.add(scrollPane, BorderLayout.CENTER);
frame.getContentPane().add(panel);
frame.setVisible(true);
}
}