|
@@ -18,15 +18,15 @@ public class Controls extends JPanel implements Observer
|
|
|
this.setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
|
|
|
this.setPreferredSize(new Dimension(1280,75));
|
|
|
this.setMinimumSize(new Dimension(320, 75));
|
|
|
- this.playback = new JSlider(new DefaultBoundedRangeModel(0, 0, 0, 0));
|
|
|
- this.playback.addChangeListener(new ChangeListener()
|
|
|
+ this.playback = new JSlider(0, 0, 0);
|
|
|
+ playback.addChangeListener(new ChangeListener()
|
|
|
{
|
|
|
public void stateChanged(ChangeEvent e)
|
|
|
{
|
|
|
- if (playback.getValue() != model.getThingies().size())
|
|
|
- {
|
|
|
- model.changeThingy(playback.getValue() - 1);
|
|
|
- }
|
|
|
+ if (!playback.getValueIsAdjusting() && playback.getValue() != model.getThingies().size())
|
|
|
+ {
|
|
|
+ //if (playback.getValue() >= 1) model.changeThingy(playback.getValue() - 1);
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
this.playback.setPreferredSize(new Dimension(280, 75));
|
|
@@ -39,8 +39,8 @@ public class Controls extends JPanel implements Observer
|
|
|
int len = model.getThingies().size();
|
|
|
if (len > 0)
|
|
|
{
|
|
|
- //playback.setMaximum(len);
|
|
|
- //playback.setValue(len);
|
|
|
+ playback.setMaximum(len);
|
|
|
+ playback.setValue(len);
|
|
|
}
|
|
|
this.setBackground(model.controlColour);
|
|
|
revalidate();
|