From fab1417421d73957cb6b05b7e7d320626e3b83e4 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Fri, 29 Mar 2013 17:36:03 +0400 Subject: [PATCH] Fixed #178: During watching a game you get Concede and Cancel as menu point with right mouse button --- Mage.Client/src/main/java/mage/client/game/GamePanel.java | 6 ++++++ .../src/main/java/mage/client/game/PlayAreaPanel.java | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index 1a60a09c5ff..09c32a6cbb5 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -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() { diff --git a/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java b/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java index 069b8acb1df..5f763feb966 100644 --- a/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java +++ b/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java @@ -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;