Skip to content
Merged
Changes from all commits
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
17 changes: 16 additions & 1 deletion src/main/java/org/scijava/ui/swing/widget/SwingNumberWidget.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
import java.awt.event.AdjustmentListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.awt.event.MouseWheelEvent;
import java.awt.event.MouseWheelListener;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.text.DecimalFormat;
Expand Down Expand Up @@ -68,7 +70,7 @@
*/
@Plugin(type = InputWidget.class)
public class SwingNumberWidget extends SwingInputWidget<Number> implements
NumberWidget<JPanel>, AdjustmentListener, ChangeListener
NumberWidget<JPanel>, AdjustmentListener, ChangeListener, MouseWheelListener
{

@Parameter
Expand Down Expand Up @@ -159,6 +161,17 @@ else if (source == spinner) {
}
updateModel();
}

// -- MouseWheelListener methods --

@Override
public void mouseWheelMoved(final MouseWheelEvent e) {
int value = getValue().intValue() + e.getWheelRotation();
value = Math.min(value, this.get().getMax().intValue());
value = Math.max(value, this.get().getMin().intValue());
spinner.setValue(value);
syncSliders();
}

// -- Helper methods --

Expand All @@ -180,6 +193,7 @@ private void addScrollBar(final Number min, final Number max,
setToolTip(scrollBar);
getComponent().add(scrollBar);
scrollBar.addAdjustmentListener(this);
scrollBar.addMouseWheelListener(this);
}

private void addSlider(final Number min, final Number max,
Expand Down Expand Up @@ -213,6 +227,7 @@ private void addSlider(final Number min, final Number max,
setToolTip(slider);
getComponent().add(slider);
slider.addChangeListener(this);
slider.addMouseWheelListener(this);
}

/**
Expand Down