/[classpath]/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java
ViewVC logotype

Diff of /classpath/javax/swing/plaf/basic/BasicScrollBarUI.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.29 by rabbit78, Thu Oct 27 12:42:16 2005 UTC revision 1.30 by rabbit78, Tue Nov 15 20:32:46 2005 UTC
# Line 62  import javax.swing.LookAndFeel; Line 62  import javax.swing.LookAndFeel;
62  import javax.swing.SwingConstants;  import javax.swing.SwingConstants;
63  import javax.swing.SwingUtilities;  import javax.swing.SwingUtilities;
64  import javax.swing.Timer;  import javax.swing.Timer;
 import javax.swing.UIDefaults;  
65  import javax.swing.UIManager;  import javax.swing.UIManager;
66  import javax.swing.event.ChangeEvent;  import javax.swing.event.ChangeEvent;
67  import javax.swing.event.ChangeListener;  import javax.swing.event.ChangeListener;
# Line 501  public class BasicScrollBarUI extends Sc Line 500  public class BasicScrollBarUI extends Sc
500     */     */
501    protected void configureScrollBarColors()    protected void configureScrollBarColors()
502    {    {
503      UIDefaults defaults = UIManager.getLookAndFeelDefaults();      trackColor = UIManager.getColor("ScrollBar.track");
504        trackHighlightColor = UIManager.getColor("ScrollBar.trackHighlight");
505      trackColor = defaults.getColor("ScrollBar.track");      thumbColor = UIManager.getColor("ScrollBar.thumb");
506      trackHighlightColor = defaults.getColor("ScrollBar.trackHighlight");      thumbHighlightColor = UIManager.getColor("ScrollBar.thumbHighlight");
507      thumbColor = defaults.getColor("ScrollBar.thumb");      thumbDarkShadowColor = UIManager.getColor("ScrollBar.thumbDarkShadow");
508      thumbHighlightColor = defaults.getColor("ScrollBar.thumbHighlight");      thumbLightShadowColor = UIManager.getColor("ScrollBar.thumbShadow");
     thumbDarkShadowColor = defaults.getColor("ScrollBar.thumbDarkShadow");  
     thumbLightShadowColor = defaults.getColor("ScrollBar.thumbShadow");  
509    }    }
510    
511    /**    /**
# Line 660  public class BasicScrollBarUI extends Sc Line 657  public class BasicScrollBarUI extends Sc
657          width += decrButton.getPreferredSize().getWidth();          width += decrButton.getPreferredSize().getWidth();
658    
659          width += (scrollbar.getMaximum() - scrollbar.getMinimum());          width += (scrollbar.getMaximum() - scrollbar.getMinimum());
660            height = UIManager.getInt("ScrollBar.width");
         height = Math.max(incrButton.getPreferredSize().height,  
                           decrButton.getPreferredSize().height);  
         height = Math.max(getMinimumThumbSize().height, height);  
         height = Math.min(getMaximumThumbSize().height, height);  
661        }        }
662      else      else
663        {        {
# Line 672  public class BasicScrollBarUI extends Sc Line 665  public class BasicScrollBarUI extends Sc
665          height += decrButton.getPreferredSize().getHeight();          height += decrButton.getPreferredSize().getHeight();
666    
667          height += (scrollbar.getMaximum() - scrollbar.getMinimum());          height += (scrollbar.getMaximum() - scrollbar.getMinimum());
668            width = UIManager.getInt("ScrollBar.width");
         width = Math.max(incrButton.getPreferredSize().width,  
                          decrButton.getPreferredSize().width);  
         width = Math.max(getMinimumThumbSize().width, width);  
         width = Math.min(getMaximumThumbSize().width, width);  
669        }        }
670    
671      Insets insets = scrollbar.getInsets();      Insets insets = scrollbar.getInsets();

Legend:
Removed from v.1.29  
changed lines
  Added in v.1.30

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26