github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

[UI] Displaying current phase

Browse source
This commit is contained in:
magenoxx 2012-07-25 00:21:53 +04:00
parent bef51b5085
commit 421732a404
1 changed files with 20 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,7 +77,8 @@ import java.util.concurrent.ExecutionException;
public class GamePanel extends javax.swing.JPanel { public class GamePanel extends javax.swing.JPanel {
private final static Logger logger = Logger.getLogger(GamePanel.class); private final static Logger logger = Logger.getLogger(GamePanel.class);
static final String YOUR_HAND = "Your hand"; private static final String YOUR_HAND = "Your hand";
private static final int X_PHASE_WIDTH = 55;
private Map<UUID, PlayAreaPanel> players = new HashMap<UUID, PlayAreaPanel>(); private Map<UUID, PlayAreaPanel> players = new HashMap<UUID, PlayAreaPanel>();
private Map<UUID, ExileZoneDialog> exiles = new HashMap<UUID, ExileZoneDialog>(); private Map<UUID, ExileZoneDialog> exiles = new HashMap<UUID, ExileZoneDialog>();
@ -223,7 +224,7 @@ public class GamePanel extends javax.swing.JPanel {
} }
int height = pnlBattlefield.getHeight(); int height = pnlBattlefield.getHeight();
phasesContainer.setPreferredSize(new Dimension(75, height)); phasesContainer.setPreferredSize(new Dimension(X_PHASE_WIDTH, height));
DialogManager.getManager().setScreenWidth(rect.width); DialogManager.getManager().setScreenWidth(rect.width);
DialogManager.getManager().setScreenHeight(rect.height); DialogManager.getManager().setScreenHeight(rect.height);
@ -490,9 +491,8 @@ public class GamePanel extends javax.swing.JPanel {
logger.warn("step is null"); logger.warn("step is null");
return; return;
} }
if (prevStep != null && prevBGColor != null) { if (currentStep != null) {
prevStep.setBackground(prevBGColor); currentStep.setLocation(prevPoint);
prevStep.setForeground(DEFAULT_FOREGROUND_COLOR);
} }
switch (step) { switch (step) {
case UNTAP: updateButton("Untap"); break; case UNTAP: updateButton("Untap"); break;
@ -509,23 +509,12 @@ public class GamePanel extends javax.swing.JPanel {
} }
} }
private void updateButton(JButton button) {
/*if (prevBGColor == null) prevBGColor = button.getBackground();
button.setBackground(new Color(0,0,0,100));
button.setForeground(Color.white);
prevStep = button;
*/
}
private void updateButton(String name) { private void updateButton(String name) {
if (hoverButtons.containsKey(name)) { if (hoverButtons.containsKey(name)) {
hoverButtons.get(name).setAlignmentX(0.0f); currentStep = hoverButtons.get(name);
prevPoint = currentStep.getLocation();
currentStep.setLocation(prevPoint.x - 15, prevPoint.y);
} }
/*if (prevBGColor == null) prevBGColor = button.getBackground();
button.setBackground(new Color(0,0,0,100));
button.setForeground(Color.white);
*/
//prevStep = button;
} }
private void showRevealed(GameView game) { private void showRevealed(GameView game) {
@ -969,10 +958,9 @@ public class GamePanel extends javax.swing.JPanel {
pnlBattlefield.setLayout(new java.awt.GridBagLayout()); pnlBattlefield.setLayout(new java.awt.GridBagLayout());
jPhases = new JPanel(); jPhases = new JPanel();
jPhases.setBackground(new Color(0, 0, 0, 100)); jPhases.setBackground(new Color(0, 0, 0, 0));
//jPhases.setLayout(new GridLayout(0, 1)); jPhases.setLayout(null);
jPhases.setLayout(new BoxLayout(jPhases, BoxLayout.PAGE_AXIS)); jPhases.setPreferredSize(new Dimension(X_PHASE_WIDTH, 450));
jPanel3.setPreferredSize(new Dimension(75, 100));
String[] phases = {"Untap", "Upkeep", "Draw", "Main1", String[] phases = {"Untap", "Upkeep", "Draw", "Main1",
"Combat_Start", "Combat_Attack", "Combat_Block", "Combat_Damage", "Combat_End", "Combat_Start", "Combat_Attack", "Combat_Block", "Combat_Damage", "Combat_End",
@ -981,70 +969,15 @@ public class GamePanel extends javax.swing.JPanel {
createPhaseButton(name); createPhaseButton(name);
} }
for (HoverButton hoverButton : hoverButtons.values()) { int i = 0;
//hoverButton.setAlignmentX(RIGHT_ALIGNMENT); for (String name : hoverButtons.keySet()) {
HoverButton hoverButton = hoverButtons.get(name);
hoverButton.setAlignmentX(LEFT_ALIGNMENT);
hoverButton.setBounds(X_PHASE_WIDTH - 36, i*36, 36, 36);
jPhases.add(hoverButton); jPhases.add(hoverButton);
i++;
} }
/*upkeep = new JButton("Up");
upkeep.setToolTipText("Upkeep");
upkeep.setAlignmentX(RIGHT_ALIGNMENT);
draw = new JButton("D");
draw.setToolTipText("Draw");
draw.setAlignmentX(RIGHT_ALIGNMENT);
main1 = new JButton("M1");
main1.setToolTipText("Main#1");
main1.setAlignmentX(RIGHT_ALIGNMENT);
attack = new JButton("A");
attack.setToolTipText("Attack");
attack.setAlignmentX(RIGHT_ALIGNMENT);
block = new JButton("B");
block.setToolTipText("Block");
block.setAlignmentX(RIGHT_ALIGNMENT);
combatButton = new JButton("C");
combatButton.setToolTipText("Combat damage");
combatButton.setAlignmentX(RIGHT_ALIGNMENT);
main2 = new JButton("M2");
main2.setToolTipText("Main#2");
main2.setAlignmentX(RIGHT_ALIGNMENT);
endOfTurn = new JButton("End");
endOfTurn.setToolTipText("End The Turn");
endOfTurn.setAlignmentX(RIGHT_ALIGNMENT);
endOfTurn.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
if (feedbackPanel != null && FeedbackMode.SELECT.equals(feedbackPanel.getMode())) {
logger.info("user pressed End Of Turn");
endButtonTip.setVisible(false);
session.sendPlayerInteger(gameId, 0);
}
}
});*/
//endButtonTip = new JLabel("<-- Press this button to end the turn");
//endButtonTip.setForeground(Color.white);
/*jPhases.add(untap);
untap.setAlignmentX(.0f);
jPhases.add(upkeep);
upkeep.setAlignmentX(.0f);
jPhases.add(draw);
draw.setAlignmentX(.0f);
jPhases.add(main1);
main1.setAlignmentX(0.3f);
jPhases.add(attack);
attack.setAlignmentX(.0f);
jPhases.add(block);
block.setAlignmentX(.0f);
jPhases.add(combatButton);
combatButton.setAlignmentX(.0f);
jPhases.add(main2);
main2.setAlignmentX(0.5f);
jPhases.add(endOfTurn);
endOfTurn.setAlignmentX(.0f);
//jPhases.add(endButtonTip);
*/
pnlReplay.setOpaque(false); pnlReplay.setOpaque(false);
helper = new HelperPanel(); helper = new HelperPanel();
helper.setPreferredSize(new Dimension(100, 90)); helper.setPreferredSize(new Dimension(100, 90));
@ -1260,22 +1193,12 @@ public class GamePanel extends javax.swing.JPanel {
private HandPanel handContainer; private HandPanel handContainer;
private javax.swing.JSplitPane jSplitPane2; private javax.swing.JSplitPane jSplitPane2;
private Color prevBGColor;
private final static Color DEFAULT_FOREGROUND_COLOR = Color.BLACK;
private JPanel jPhases; private JPanel jPhases;
private JPanel phasesContainer; private JPanel phasesContainer;
private JButton untap;
private JButton upkeep; private HoverButton currentStep;
private JButton draw; private Point prevPoint;
private JButton main1;
private JButton attack;
private JButton block;
private JButton combatButton;
private JButton main2;
private JButton endOfTurn;
private JButton prevStep;
private JLabel endButtonTip;
private boolean imagePanelState; private boolean imagePanelState;