# HG changeset patch # User rupashka # Date 1250859567 -14400 # Node ID 72286b35d392a20f44661befbfa2c2fdedcdee57 # Parent b8899f94572e656926e0c8b25a4569545d0b4857 6579827: vista : JSlider on JColorchooser is not properly render or can't be seen completely. Reviewed-by: peterz diff -r b8899f94572e -r 72286b35d392 jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java --- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java Thu Aug 20 23:30:03 2009 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java Fri Aug 21 16:59:27 2009 +0400 @@ -1507,7 +1507,8 @@ propertyName == "paintTicks" || propertyName == "paintTrack" || propertyName == "font" || - propertyName == "paintLabels") { + propertyName == "paintLabels" || + propertyName == "Slider.paintThumbArrowShape") { checkedLabelBaselines = false; calculateGeometry(); slider.repaint(); diff -r b8899f94572e -r 72286b35d392 jdk/test/javax/swing/JSlider/6579827/bug6579827.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/JSlider/6579827/bug6579827.java Fri Aug 21 16:59:27 2009 +0400 @@ -0,0 +1,68 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* @test + * @bug 6579827 + * @summary vista : JSlider on JColorchooser is not properly render or can't be seen completely + * @author Pavel Porvatov + @run main bug6579827 + */ + +import sun.awt.OSInfo; + +import javax.swing.*; +import java.awt.*; + +public class bug6579827 { + public static void main(String[] args) throws Exception { + if (OSInfo.getOSType() != OSInfo.OSType.WINDOWS || + OSInfo.getWindowsVersion() != OSInfo.WINDOWS_VISTA) { + System.out.println("This test is only for Windows Vista. Skipped."); + + return; + } + + SwingUtilities.invokeLater(new Runnable() { + public void run() { + try { + UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel"); + } catch (Exception e) { + e.printStackTrace(); + + throw new RuntimeException(e); + } + + JSlider slider = new JSlider(JSlider.VERTICAL, 0, 100, 0); + + Dimension prefferdSize = slider.getPreferredSize(); + + slider.setPaintTrack(false); + slider.putClientProperty("Slider.paintThumbArrowShape", Boolean.TRUE); + + if (prefferdSize.equals(slider.getPreferredSize())) { + throw new RuntimeException(); + } + } + }); + } +}