X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fgui%2FFaderPanel.java;h=cb4102ca93f83a38ecca6fb7e03d3413831a1757;hb=a5c77e5321c39d49a36ac0c5c5a979bbeeb4e24e;hp=b6b0d5b2641bbb9c06f9fc8b8027bfea8e592996;hpb=9178ad72e324d92a1857073740a4c57bbe243028;p=sonitus.git diff --git a/src/main/java/net/pterodactylus/sonitus/gui/FaderPanel.java b/src/main/java/net/pterodactylus/sonitus/gui/FaderPanel.java index b6b0d5b..cb4102c 100644 --- a/src/main/java/net/pterodactylus/sonitus/gui/FaderPanel.java +++ b/src/main/java/net/pterodactylus/sonitus/gui/FaderPanel.java @@ -20,7 +20,6 @@ package net.pterodactylus.sonitus.gui; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.Insets; -import javax.swing.BorderFactory; import javax.swing.DefaultBoundedRangeModel; import javax.swing.JLabel; import javax.swing.JPanel; @@ -45,26 +44,21 @@ public class FaderPanel extends JPanel { */ public FaderPanel(final Fader fader) { super(new GridBagLayout()); - setBorder(BorderFactory.createEmptyBorder(12, 12, 12, 12)); - - /* create label. */ - JLabel label = new JLabel("Volume"); - add(label, new GridBagConstraints(0, 0, 1, 1, 0, 0, GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); /* create fader labels. */ - add(new JLabel("-∞"), new GridBagConstraints(1, 0, 1, 1, 0, 0, GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0, 6, 0, 0), 0, 0)); - add(new JLabel("0"), new GridBagConstraints(3, 0, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0, 6, 0, 0), 0, 0)); + add(new JLabel("-∞"), new GridBagConstraints(0, 0, 1, 1, 0, 0, GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0, 6, 0, 0), 0, 0)); + add(new JLabel("0"), new GridBagConstraints(2, 0, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0, 6, 0, 0), 0, 0)); /* create fader. */ - JSlider slider = new JSlider(new DefaultBoundedRangeModel(fader.value(), 0, fader.minimum(), fader.maximum())); + JSlider slider = new JSlider(new DefaultBoundedRangeModel((int) (fader.value() * Integer.MAX_VALUE), 0, 0, Integer.MAX_VALUE)); slider.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent changeEvent) { - fader.value(((JSlider) changeEvent.getSource()).getValue()); + fader.value(((JSlider) changeEvent.getSource()).getValue() / (double) Integer.MAX_VALUE); } }); - add(slider, new GridBagConstraints(2, 0, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); + add(slider, new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); } }