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

* GUI: new reworked GUI and card render engine, card icons and dozens of other fixes (see full list in related PR);

Browse source
This commit is contained in:
Oleg Agafonov 2021-01-30 16:38:55 +04:00
parent df98cc3e62
commit a1da5ef437
304 changed files with 7266 additions and 5093 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Mage.Client/src/main/java/mage/client/deckeditor/table/MageCardComparator.java
View file

@ -1,45 +1,18 @@
/* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.client.deckeditor.table;
import mage.cards.MageCard;
import mage.client.util.comparators.CardViewComparator;
import mage.game.draft.RateCard;
import mage.view.CardView;
import org.apache.log4j.Logger;
import java.util.Comparator;
/**
* {@link MageCard} comparator. Used to sort cards in Deck Editor Table View
* pane.
*
* @author nantuko
*/
public class MageCardComparator implements Comparator<CardView> {
public class MageCardComparator implements CardViewComparator {
private static final Logger logger = Logger.getLogger(MageCardComparator.class);
@ -122,5 +95,10 @@ public class MageCardComparator implements Comparator<CardView> {
} else {
return bCom.compareTo(aCom);
}
}// compare()
}
@Override
public String getCategoryName(CardView sample) {
return "";
}
}

13
Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java
View file

@ -293,22 +293,17 @@ public class TableModel extends AbstractTableModel implements ICardGrid {
cardEventSource.fireEvent(card, ClientEventType.SET_NUMBER, number);
}
public void doubleClick(int index) {
public void doubleClick(int index, MouseEvent e, boolean forceFakeAltDown) {
CardView card = view.get(index);
cardEventSource.fireEvent(card, ClientEventType.DOUBLE_CLICK);
}
public void altDoubleClick(int index) {
CardView card = view.get(index);
cardEventSource.fireEvent(card, ClientEventType.ALT_DOUBLE_CLICK);
cardEventSource.fireEvent(card, ClientEventType.CARD_DOUBLE_CLICK, e, forceFakeAltDown);
}
public void removeFromMainEvent(int index) {
cardEventSource.fireEvent(ClientEventType.REMOVE_MAIN);
cardEventSource.fireEvent(ClientEventType.DECK_REMOVE_SELECTION_MAIN);
}
public void removeFromSideEvent(int index) {
cardEventSource.fireEvent(ClientEventType.REMOVE_SIDEBOARD);
cardEventSource.fireEvent(ClientEventType.DECK_REMOVE_SELECTION_SIDEBOARD);
}
public void addListeners(final JTable table) {