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

Fixed #178: During watching a game you get Concede and Cancel as menu point with right mouse button

Browse source
This commit is contained in:
magenoxx 2013-03-29 17:36:03 +04:00
parent 05191e8793
commit fab1417421
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -288,6 +288,9 @@ public final class GamePanel extends javax.swing.JPanel {
if (!session.watchGame(gameId)) {
hideGame();
}
for (PlayAreaPanel panel : getPlayers().values()) {
panel.setPlayingMode(false);
}
}
public synchronized void replayGame(UUID gameId) {
@ -306,6 +309,9 @@ public final class GamePanel extends javax.swing.JPanel {
if (!session.startReplay(gameId)) {
hideGame();
}
for (PlayAreaPanel panel : getPlayers().values()) {
panel.setPlayingMode(false);
}
}
public void hideGame() {

7
Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
View file

@ -51,6 +51,7 @@ public class PlayAreaPanel extends javax.swing.JPanel {
private UUID playerId;
private UUID gameId;
private boolean smallMode = false;
private boolean playingMode = true;
public static final int PANEL_HEIGHT = 242;
public static final int PANEL_HEIGHT_SMALL = 190;
@ -91,7 +92,7 @@ public class PlayAreaPanel extends javax.swing.JPanel {
battlefieldPanel.getMainPanel().addMouseListener(new MouseAdapter() {
public void mouseReleased(MouseEvent Me) {
if (Me.isPopupTrigger()) {
if (Me.isPopupTrigger() && playingMode) {
Pmenu.show(Me.getComponent(), Me.getX(), Me.getY());
}
}
@ -183,6 +184,10 @@ public class PlayAreaPanel extends javax.swing.JPanel {
return smallMode;
}
public void setPlayingMode(boolean playingMode) {
this.playingMode = playingMode;
}
private mage.client.game.BattlefieldPanel battlefieldPanel;
private javax.swing.JButton btnCheat;
//private javax.swing.JScrollPane jScrollPane1;