github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Separate setting for split position in sideboarding vs deck construction

Browse source 
* Depending on the orientation of the sideboard / maindeck the split should be a separate setting, not one single one.
This commit is contained in:
Mark Langen 2016-10-04 01:18:50 -06:00
parent 5af417ed0b
commit d604b18f6b
1 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java
View file

@ -64,6 +64,9 @@ public class DeckArea extends javax.swing.JPanel {
private Set<UUID> hiddenCards = new HashSet<>();
private Deck lastDeck = new Deck();
private BigCard lastBigCard = null;
private int dividerLocationNormal = 0;
private int dividerLocationLimited = 0;
private boolean isLimitedBuildingOrientation = false;
public DeckCardLayout getCardLayout() {
return deckList.getCardLayout();
@ -76,9 +79,10 @@ public class DeckArea extends javax.swing.JPanel {
public static class Settings {
public DragCardGrid.Settings maindeckSettings;
public DragCardGrid.Settings sideboardSetings;
public int dividerLocation;
public int dividerLocationLimited;
public int dividerLocationNormal;
private static Pattern parser = Pattern.compile("([^|]*)\\|([^|]*)\\|([^|]*)");
private static Pattern parser = Pattern.compile("([^|]*)\\|([^|]*)\\|([^|]*)\\|([^|]*)");
public static Settings parse(String s) {
Matcher m = parser.matcher(s);
@ -86,7 +90,8 @@ public class DeckArea extends javax.swing.JPanel {
Settings settings = new Settings();
settings.maindeckSettings = DragCardGrid.Settings.parse(m.group(1));
settings.sideboardSetings = DragCardGrid.Settings.parse(m.group(2));
settings.dividerLocation = Integer.parseInt(m.group(3));
settings.dividerLocationNormal = Integer.parseInt(m.group(3));
settings.dividerLocationLimited = Integer.parseInt(m.group(4));
return settings;
} else {
return null;
@ -95,7 +100,7 @@ public class DeckArea extends javax.swing.JPanel {
@Override
public String toString() {
return maindeckSettings.toString() + "|" + sideboardSetings.toString() + "|" + dividerLocation;
return maindeckSettings.toString() + "|" + sideboardSetings.toString() + "|" + dividerLocationNormal + "|" + dividerLocationLimited;
}
}
@ -161,7 +166,13 @@ public class DeckArea extends javax.swing.JPanel {
Settings settings = new Settings();
settings.maindeckSettings = deckList.saveSettings();
settings.sideboardSetings = sideboardList.saveSettings();
settings.dividerLocation = deckAreaSplitPane.getDividerLocation();
if (isLimitedBuildingOrientation) {
dividerLocationLimited = deckAreaSplitPane.getDividerLocation();
} else {
dividerLocationNormal = deckAreaSplitPane.getDividerLocation();
}
settings.dividerLocationLimited = dividerLocationLimited;
settings.dividerLocationNormal = dividerLocationNormal;
return settings;
}
@ -169,7 +180,17 @@ public class DeckArea extends javax.swing.JPanel {
if (s != null) {
deckList.loadSettings(s.maindeckSettings);
sideboardList.loadSettings(s.sideboardSetings);
deckAreaSplitPane.setDividerLocation(s.dividerLocation);
dividerLocationLimited = s.dividerLocationLimited;
dividerLocationNormal = s.dividerLocationNormal;
if (isLimitedBuildingOrientation) {
if (dividerLocationLimited != 0) {
deckAreaSplitPane.setDividerLocation(s.dividerLocationLimited);
}
} else {
if (dividerLocationNormal != 0) {
deckAreaSplitPane.setDividerLocation(s.dividerLocationNormal);
}
}
}
}
@ -191,8 +212,14 @@ public class DeckArea extends javax.swing.JPanel {
public void setOrientation(boolean limitedBuildingOrientation) {
if (limitedBuildingOrientation) {
deckAreaSplitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
if (dividerLocationLimited != 0) {
deckAreaSplitPane.setDividerLocation(dividerLocationLimited);
}
} else {
deckAreaSplitPane.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
if (dividerLocationNormal != 0) {
deckAreaSplitPane.setDividerLocation(dividerLocationNormal);
}
}
}