mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 11:18:01 +00:00
- Added some colors for the different phases.
This commit is contained in:
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
package forge;
|
package forge;
|
||||||
|
|
||||||
|
|
||||||
@@ -58,6 +57,8 @@ import javax.swing.JTextArea;
|
|||||||
import javax.swing.ScrollPaneConstants;
|
import javax.swing.ScrollPaneConstants;
|
||||||
import javax.swing.SwingConstants;
|
import javax.swing.SwingConstants;
|
||||||
import javax.swing.SwingUtilities;
|
import javax.swing.SwingUtilities;
|
||||||
|
import javax.swing.border.Border;
|
||||||
|
import javax.swing.border.EmptyBorder;
|
||||||
import javax.swing.border.EtchedBorder;
|
import javax.swing.border.EtchedBorder;
|
||||||
import javax.swing.border.TitledBorder;
|
import javax.swing.border.TitledBorder;
|
||||||
import javax.swing.event.ListSelectionEvent;
|
import javax.swing.event.ListSelectionEvent;
|
||||||
@@ -252,7 +253,26 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void showMessage(String s) {
|
public void showMessage(String s) {
|
||||||
|
|
||||||
messageArea.setText(s);
|
messageArea.setText(s);
|
||||||
|
|
||||||
|
messageArea.setText(s);
|
||||||
|
Border border = new EmptyBorder(1, 1, 1, 1);
|
||||||
|
|
||||||
|
messageArea.setBorder(border);
|
||||||
|
|
||||||
|
int thickness = 3;
|
||||||
|
|
||||||
|
if (s.contains("Main"))
|
||||||
|
border = BorderFactory.createLineBorder(new Color(30, 0, 255), thickness);
|
||||||
|
else if (s.contains("To Block"))
|
||||||
|
border = BorderFactory.createLineBorder(new Color(13, 179, 0), thickness);
|
||||||
|
else if (s.contains("Play Instants and Abilities") )
|
||||||
|
border = BorderFactory.createLineBorder(new Color(255, 174, 0), thickness);
|
||||||
|
else if (s.contains("Declare Attackers"))
|
||||||
|
border = BorderFactory.createLineBorder(new Color(255, 0, 0), thickness);
|
||||||
|
|
||||||
|
messageArea.setBorder(border);
|
||||||
}
|
}
|
||||||
|
|
||||||
//returned Object could be null
|
//returned Object could be null
|
||||||
@@ -312,6 +332,7 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo
|
|||||||
oppCreaturePanel.addMouseMotionListener(GuiDisplayUtil.getCardDetailMouse(this));
|
oppCreaturePanel.addMouseMotionListener(GuiDisplayUtil.getCardDetailMouse(this));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//opponent life mouse listener
|
//opponent life mouse listener
|
||||||
oppLifeLabel.addMouseListener(new MouseAdapter() {
|
oppLifeLabel.addMouseListener(new MouseAdapter() {
|
||||||
|
|
||||||
@@ -557,6 +578,7 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo
|
|||||||
label = new JLabel("" + (count++) + ". " + stack.peek(i).getStackDescription());
|
label = new JLabel("" + (count++) + ". " + stack.peek(i).getStackDescription());
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//update card detail
|
//update card detail
|
||||||
final CardPanel cardPanel = new CardPanel(stack.peek(i).getSourceCard());
|
final CardPanel cardPanel = new CardPanel(stack.peek(i).getSourceCard());
|
||||||
cardPanel.setLayout(new BorderLayout());
|
cardPanel.setLayout(new BorderLayout());
|
||||||
@@ -868,6 +890,7 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo
|
|||||||
if(!Gui_NewGame.useLAFFonts.isSelected()) oppGraveButton.setFont(statFont);
|
if(!Gui_NewGame.useLAFFonts.isSelected()) oppGraveButton.setFont(statFont);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
JPanel gravePanel = new JPanel(new BorderLayout());
|
JPanel gravePanel = new JPanel(new BorderLayout());
|
||||||
gravePanel.add(oppGraveButton, BorderLayout.EAST);
|
gravePanel.add(oppGraveButton, BorderLayout.EAST);
|
||||||
|
|
||||||
@@ -1186,6 +1209,7 @@ public class GuiDisplay4 extends JFrame implements CardContainer, Display, NewCo
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//very hacky
|
//very hacky
|
||||||
@@ -1355,3 +1379,4 @@ class Gui_MultipleBlockers4 extends JFrame {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user