changeset 2928:76b39a4964fa

6542335: different behavior on knob of scroll bar between 1.4.2 and 5.0 Reviewed-by: peterz
author alexp
date Fri, 17 Sep 2010 23:34:53 +0400
parents e753db9c4416
children 002495e6aecb
files src/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java test/javax/swing/JScrollBar/6542335/bug6542335.java
diffstat 2 files changed, 93 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java	Fri Sep 17 23:21:51 2010 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java	Fri Sep 17 23:34:53 2010 +0400
@@ -1603,6 +1603,7 @@
                 BoundedRangeModel newModel = (BoundedRangeModel)e.getNewValue();
                 oldModel.removeChangeListener(modelListener);
                 newModel.addChangeListener(modelListener);
+                scrollBarValue = scrollbar.getValue();
                 scrollbar.repaint();
                 scrollbar.revalidate();
             } else if ("orientation" == propertyName) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/swing/JScrollBar/6542335/bug6542335.java	Fri Sep 17 23:34:53 2010 +0400
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2010, 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.
+ */
+
+/* @test
+   @bug 6542335
+   @summary different behavior on knob of scroll bar between 1.4.2 and 5.0
+   @author  Alexander Potochkin
+   @run main bug6542335
+*/
+
+import sun.awt.SunToolkit;
+
+import javax.swing.*;
+import javax.swing.plaf.basic.BasicScrollBarUI;
+import java.awt.*;
+import java.awt.event.InputEvent;
+
+public class bug6542335 {
+    private static JScrollBar sb;
+    private static MyScrollBarUI ui;
+
+    public static void main(String[] args) throws Exception {
+        Robot robot = new Robot();
+        robot.setAutoDelay(10);
+
+        SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                final JFrame frame = new JFrame("bug6542335");
+                frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+                sb = new JScrollBar(0, 0, 1, 0, 1);
+
+                ui = new MyScrollBarUI();
+                sb.setUI(ui);
+
+                sb.setPreferredSize(new Dimension(200, 17));
+                DefaultBoundedRangeModel rangeModel = new DefaultBoundedRangeModel();
+                rangeModel.setMaximum(100);
+                rangeModel.setMinimum(0);
+                rangeModel.setExtent(50);
+                rangeModel.setValue(50);
+
+                sb.setModel(rangeModel);
+                frame.add(sb);
+
+                frame.setSize(200, 100);
+                frame.setVisible(true);
+            }
+        });
+
+        Rectangle thumbBounds = new Rectangle(ui.getThumbBounds());
+
+        toolkit.realSync();
+        Point l = sb.getLocationOnScreen();
+        robot.mouseMove(l.x + (int) (0.75 * sb.getWidth()), l.y + sb.getHeight()/2);
+        robot.mousePress(InputEvent.BUTTON1_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_MASK);
+        toolkit.realSync();
+
+        if (!thumbBounds.equals(ui.getThumbBounds())) {
+            throw new RuntimeException("Test failed");
+        }
+    }
+
+    static class MyScrollBarUI extends BasicScrollBarUI {
+        public Rectangle getThumbBounds() {
+            return super.getThumbBounds();
+        }
+    }
+}