fix for slider with major tick spacing 0

BobHanson · BobHanson · commit 739d7ba717fa · 2020-01-23T07:14:56.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSliderUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSliderUI.java
@@ -86,10 +86,10 @@ public DOMNode updateDOMNode() {
 		if (!isScrollBar) {
 			minorSpacing = slider.getMinorTickSpacing();
 			majorSpacing = slider.getMajorTickSpacing();
-			paintTicks = slider.getPaintTicks();
-			paintLabels = slider.getPaintLabels();
+			paintTicks = (majorSpacing > 0 && slider.getPaintTicks());
+			paintLabels = (majorSpacing > 0 && slider.getPaintLabels());
 			paintTrack = slider.getPaintTrack();
-			snapToTicks = slider.getSnapToTicks();
+			snapToTicks = (majorSpacing > 0 && slider.getSnapToTicks());
 		}
 		orientation = (slider.getOrientation() == SwingConstants.VERTICAL ? "vertical" : "horizontal");
 		model = slider.getModel();
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Applet_Scroll.java b/sources/net.sf.j2s.java.core/src/test/Test_Applet_Scroll.java
@@ -215,8 +215,12 @@ public void actionPerformed(ActionEvent event) {
 		p.setOpaque(false);
 		mkBar(p, tf, Adjustable.VERTICAL, 20, 200);
 		mkSlider(p, tf, Adjustable.VERTICAL, 20, 200);
-		mkSlider(p, tf, Adjustable.VERTICAL, 20, 200).setInverted(true);
-		p.add(label);
+		JSlider slider = mkSlider(p, tf, Adjustable.VERTICAL, 70, 200);
+		slider.setInverted(false);
+        slider.setPaintTicks(true);
+        slider.setPaintLabels(true);
+        slider.setMajorTickSpacing(100);
+        p.add(label);
 		p.add(tf);
 		p.add(button);
 		p.add(button2);
@@ -226,11 +230,11 @@ public void actionPerformed(ActionEvent event) {
 	    formatChoice.insertItemAt("hex", 1);
 	    p.add(formatChoice);
 		mkBar(p, tf, Adjustable.HORIZONTAL, 100, 20);
-		JSlider slider = mkSlider(p, tf, Adjustable.HORIZONTAL, 100, 20);
+		slider = mkSlider(p, tf, Adjustable.HORIZONTAL, 100, 20);
         slider.setPaintTicks(true);
         slider.setPaintLabels(true);
-        slider.setPreferredSize(new Dimension(100, 100));
         slider.setMajorTickSpacing(200);
+        slider.setPreferredSize(new Dimension(100, 100));
         slider.setBackground(Color.WHITE);
         slider.setForeground(Color.BLUE);
 
