Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix for slider with major tick spacing 0
  • Loading branch information
BobHanson committed Jan 23, 2020
commit 739d7ba717fa8c69a4b47773f35385c53866fc46
6 changes: 3 additions & 3 deletions sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSliderUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
12 changes: 8 additions & 4 deletions sources/net.sf.j2s.java.core/src/test/Test_Applet_Scroll.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);

Expand Down