external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Draft: pick with either LMB dblclick or clicking RMB once on selected row

Browse Source
This commit is contained in:
Maxmtg
2011-09-11 14:02:53 +00:00
parent 8e57d2341c
commit b7fcbc9e21
2 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/forge/gui/deckeditor/DeckEditorDraft.java
View File

@@ -43,15 +43,33 @@ public class DeckEditorDraft extends DeckEditorBase implements NewConstants, New
private BoosterDraft boosterDraft; private BoosterDraft boosterDraft;
private JButton jButton1 = new JButton(); private JButton jButtonPick = new JButton();
private CardPanelLite cardView = new CardPanelLite(); private CardPanelLite cardView = new CardPanelLite();
/**
* <p>showGui.</p> private MouseListener pickWithMouse = new MouseAdapter() {
* @Override
* @param in_boosterDraft a {@link forge.game.limited.BoosterDraft} object. public void mouseClicked(final MouseEvent e) {
*/ // Pick on left-button double click
if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0 && e.getClickCount() == 2) {
jButtonPickClicked(null);
} else if ((e.getModifiers() & InputEvent.BUTTON3_MASK) != 0) { // pick on right click
JTable table = top.getTable();
int rowNumber = table.rowAtPoint(e.getPoint());
// after hittest - if it was outside of rows - discard this click
if (rowNumber == -1) { return; }
// if row was not selected, select it. If it was, pick a card
if (rowNumber != table.getSelectedRow()) {
table.getSelectionModel().setSelectionInterval(rowNumber, rowNumber);
} else {
jButtonPickClicked(null);
}
}
}
};
public void showGui(BoosterDraft in_boosterDraft) { public void showGui(BoosterDraft in_boosterDraft) {
boosterDraft = in_boosterDraft; boosterDraft = in_boosterDraft;
@@ -103,19 +121,16 @@ public class DeckEditorDraft extends DeckEditorBase implements NewConstants, New
top.setup(columns, cardView); top.setup(columns, cardView);
bottom.setup(columns, cardView); bottom.setup(columns, cardView);
this.setSize(980, 740); this.setSize(980, 740);
GuiUtils.centerFrame(this); GuiUtils.centerFrame(this);
this.setResizable(false); this.setResizable(false);
top.getTable().addMouseListener(pickWithMouse);
top.getTable().addKeyListener(new KeyAdapter() { top.getTable().addKeyListener(new KeyAdapter() {
@Override public void keyPressed(final KeyEvent e) { @Override public void keyPressed(final KeyEvent e) {
if (e.getKeyChar() == ' ') { jButton1_actionPerformed(null); } } }); if (e.getKeyChar() == ' ') { jButtonPickClicked(null); } } });
top.getTable().addMouseListener(new MouseAdapter() {
@Override public void mouseClicked(final MouseEvent e) {
if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0 && e.getClickCount() == 2) {
jButton1_actionPerformed(null); } } });
} }
public DeckEditorDraft() { public DeckEditorDraft() {
@@ -149,12 +164,12 @@ public class DeckEditorDraft extends DeckEditorBase implements NewConstants, New
this.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); this.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
this.setTitle("Booster Draft"); this.setTitle("Booster Draft");
jButton1.setBounds(new Rectangle(238, 418, 147, 44)); jButtonPick.setBounds(new Rectangle(238, 418, 147, 44));
jButton1.setFont(new java.awt.Font("Dialog", 0, 16)); jButtonPick.setFont(new java.awt.Font("Dialog", 0, 16));
jButton1.setText("Choose Card"); jButtonPick.setText("Choose Card");
jButton1.addActionListener(new java.awt.event.ActionListener() { jButtonPick.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
jButton1_actionPerformed(e); jButtonPickClicked(e);
} }
}); });
@@ -162,7 +177,7 @@ public class DeckEditorDraft extends DeckEditorBase implements NewConstants, New
this.getContentPane().add(top.getTableDecorated(), null); this.getContentPane().add(top.getTableDecorated(), null);
this.getContentPane().add(bottom.getLabel(), null); this.getContentPane().add(bottom.getLabel(), null);
this.getContentPane().add(bottom.getTableDecorated(), null); this.getContentPane().add(bottom.getTableDecorated(), null);
this.getContentPane().add(jButton1, null); this.getContentPane().add(jButtonPick, null);
} }
/** /**
@@ -170,7 +185,7 @@ public class DeckEditorDraft extends DeckEditorBase implements NewConstants, New
* *
* @param e a {@link java.awt.event.ActionEvent} object. * @param e a {@link java.awt.event.ActionEvent} object.
*/ */
void jButton1_actionPerformed(final ActionEvent e) { void jButtonPickClicked(final ActionEvent e) {
CardPrinted card = top.getSelectedCard(); CardPrinted card = top.getSelectedCard();
if (null == card) { return; } if (null == card) { return; }

2
src/main/java/forge/gui/deckeditor/TableWithCards.java
View File

@@ -39,7 +39,7 @@ public final class TableWithCards {
// need this to allow users place its contents // need this to allow users place its contents
public JComponent getTableDecorated() { return jScrollPane; } public JComponent getTableDecorated() { return jScrollPane; }
public JComponent getTable() { return table; } public JTable getTable() { return table; }
public JComponent getLabel() { return statsLabel; } public JComponent getLabel() { return statsLabel; }
public TableWithCards(final String title, final boolean showStats) { public TableWithCards(final String title, final boolean showStats) {