github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix deck generator sliders.

Browse source
This commit is contained in:
rkfg 2016-03-17 06:25:56 +03:00
parent eec3e779bd
commit 74f925b579
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Mage.Client/src/main/java/mage/client/deck/generator/RatioAdjustingSliderPanel.java
View file

@ -46,6 +46,7 @@ import java.util.List;
public class RatioAdjustingSliderPanel extends JPanel { public class RatioAdjustingSliderPanel extends JPanel {
private static final int MAXIMUM = 100; private static final int MAXIMUM = 100;
private int adjustableCount;
private JStorageSlider creatureSlider, nonCreatureSlider, landSlider; private JStorageSlider creatureSlider, nonCreatureSlider, landSlider;
private List<JLabel> textLabels = new ArrayList<>(); private List<JLabel> textLabels = new ArrayList<>();
private AdjustingSliderGroup sg; private AdjustingSliderGroup sg;
@ -91,6 +92,9 @@ public class RatioAdjustingSliderPanel extends JPanel {
fireSliderChangedEvent((JStorageSlider) e.getSource()); fireSliderChangedEvent((JStorageSlider) e.getSource());
} }
}); });
if (slider.isAdjust()) {
adjustableCount++;
}
} }
} }
@ -105,25 +109,32 @@ public class RatioAdjustingSliderPanel extends JPanel {
private void updateSliderPosition(JStorageSlider source) { private void updateSliderPosition(JStorageSlider source) {
int maximum = MAXIMUM; int maximum = MAXIMUM;
int excess = 100; int excess = 100;
int sign = 0;
for (JStorageSlider slider : storageSliders) { for (JStorageSlider slider : storageSliders) {
excess -= slider.getValue(); excess -= slider.getValue();
} }
int addition = excess / (storageSliders.size() - 1); // divide the deficit between all sliders except this one sign = Integer.signum(excess);
excess = Math.abs(excess);
int addition = excess / (adjustableCount - 1); // divide the deficit between all adjustable sliders except this one
if (addition == 0 && excess != 0) { if (addition == 0 && excess != 0) {
addition = Integer.signum(excess); addition = 1;
} }
for (int i = storageSliders.size() - 1; i >= 0; i--) { for (int i = storageSliders.size() - 1; i >= 0; i--) {
JStorageSlider slider = storageSliders.get(i); JStorageSlider slider = storageSliders.get(i);
int value = slider.getValue(); int value = slider.getValue();
if (slider != source && slider.isAdjust()) { if (slider != source && slider.isAdjust()) {
slider.setMaximum(maximum); slider.setMaximum(maximum);
if (excess > addition) { if (excess >= addition) {
value += addition; value += addition * sign;
excess -= addition; excess -= addition;
} else { } else {
value += excess; value += excess * sign;
excess = 0; excess = 0;
} }
if (value < 0) {
excess += value;
value = 0;
}
slider.setValue(value); slider.setValue(value);
} }
maximum -= value; maximum -= value;