2005-07-21 David Gilbert <david.gilbert@object-refinery.com>

	* javax/swing/plaf/basic/BasicSliderUI.java:
	(thumbHeight): removed,
	(thumbWidth): removed,
	(tickHeight): removed,
	(installDefaults): deleted initialisation of thumbHeight, thumbWidth
	and thumbRect,
	(getPreferredHorizontalSize): changed source of thumb height and width,
	(getPreferredVerticalSize): likewise,
	(getMinimumHorizontalSize): reimplemented,
	(getMinimumVerticalSize): reimplemented,
	(getMinimumSize): reimplemented,
	(getMaximumSize): reimplemented,
	(calculateThumbSize): use getThumbSize(),
        (calculateThumbLocation): use trackRect not contentRect,
	(calculateTrackBuffer): use half the thumbRect,
	(getThumbSize): use constant size,
	(calculateTrackRect): move track down to middle of contentRect,
	(getTickLength): return constant,
	(paintTrack): removed unused local variables,
	(paintTicks): apply a translation to g temporarily before calling
	methods to draw ticks, add 0.5 to solve rounding problem,
	(paintMinorTickForHorizSlider): modified to account for translation
	already applied to g,
	(paintMajorTickForHorizSlider): likewise,
	(paintMinorTickForVertSlider): likewise,
	(paintMajorTickForVertSlider): likewise,
	(xPositionForValue): subtract 1 from width,
	(yPositionForValue): likewise,
	*javax/swing/plaf/metal/MetalLookAndFeel.java
	(initComponentDefaults): add slider defaults,
	*javax/swing/plaf/metal/MetalSliderUI.java: implemented missing
	methods,
	* examples/gnu/classpath/examples/swing/Demo.java
	(mkSliders): added minor ticks and labels.

1 files changed, 2 insertions, 0 deletions

diff --git a/examples/gnu/classpath/examples/swing/Demo.java b/examples/gnu/classpath/examples/swing/Demo.java
index 4471be155..eef300619 100644
--- a/examples/gnu/classpath/examples/swing/Demo.java
+++ b/examples/gnu/classpath/examples/swing/Demo.java
@@ -658,6 +658,8 @@ public class Demo
     slider.setPaintTrack(true);
     slider.setPaintTicks(true);
     slider.setMajorTickSpacing(30);
+    slider.setMinorTickSpacing(5);
+    slider.setPaintLabels(true);
     slider.setInverted(false);
     JProgressBar progress = new JProgressBar();
     BoundedRangeModel model = new DefaultBoundedRangeModel(10, 1, 0, 100);