External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changes UI needs for controlling turn.

Browse source
This commit is contained in:
magenoxx 2011-08-05 19:46:54 +04:00
parent 4cafa3fc52
commit 024c506522
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
View file

@ -159,6 +159,10 @@ public class FeedbackPanel extends javax.swing.JPanel {
logger.debug("feedback - clear");
}
public void clear0() {
stopModal();
}
private synchronized void startModal() {
try {
@ -337,7 +341,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
private void btnRightActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRightActionPerformed
this.selected = true;
clear();
clear0();
if (mode == FeedbackMode.SELECT && (evt.getModifiers() & ActionEvent.CTRL_MASK) == ActionEvent.CTRL_MASK)
session.sendPlayerInteger(gameId, 0);
else
@ -346,7 +350,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
private void btnLeftActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnLeftActionPerformed
this.selected = true;
clear();
clear0();
session.sendPlayerBoolean(gameId, true);
}//GEN-LAST:event_btnLeftActionPerformed

4
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -643,7 +643,7 @@ public class GamePanel extends javax.swing.JPanel {
btnSwitchHandActionPerformed(null);
}
});
btnSwitchHands.setBorder(BorderFactory.createLineBorder(Color.red));
//btnSwitchHands.setBorder(BorderFactory.createLineBorder(Color.red));
btnStopWatching.setText("Stop Watching");
btnStopWatching.addActionListener(new java.awt.event.ActionListener() {
@ -877,7 +877,7 @@ public class GamePanel extends javax.swing.JPanel {
JOptionPane.PLAIN_MESSAGE,
null,
choices,
YOUR_HAND);
this.chosenHandKey);
if (chosenHandKey != null && chosenHandKey.length() > 0) {
this.chosenHandKey = chosenHandKey;