Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Allow sort by EDH Power level in Deck Editor

Browse source
This commit is contained in:
spjspj 2017-05-11 17:52:43 +10:00
parent 5b225fa142
commit 347d08298f
4 changed files with 544 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java
View file

@ -424,7 +424,8 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
CMC("Converted Mana Cost", new CardViewCostComparator()),
COLOR("Color", new CardViewColorComparator()),
COLOR_IDENTITY("Color Identity", new CardViewColorIdentityComparator()),
RARITY("Rarity", new CardViewRarityComparator());
RARITY("Rarity", new CardViewRarityComparator()),
EDH_POWER_LEVEL("EDH Power Level", new CardViewEDHPowerLevelComparator());
Sort(String text, Comparator<CardView> comparator) {
this.comparator = comparator;
@ -566,7 +567,6 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
JButton analyseButton;
JButton blingButton;
// Popup for toolbar
final JPopupMenu filterPopup;
JPopupMenu selectByTypePopup;
@ -1135,10 +1135,9 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
if (offsetIntoCol2 < GRID_PADDING) {
--col2;
}
// avoids a null ref issue but only deals with symptom of problem. not sure how it gets to this state ever. see issue #3197
// if (selectionDragStartCards == null) return;
int curY = COUNT_LABEL_HEIGHT;
for (int rowIndex = 0; rowIndex < cardGrid.size(); ++rowIndex) {
int stackStartIndex;