external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

New UI: Top spell on stack shown in deail panel.

Browse Source
This commit is contained in:
Doublestrike
2011-12-03 08:28:48 +00:00
parent 72bc54c29b
commit 789ea83001
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/forge/view/match/ViewTabber.java
View File

@@ -78,7 +78,7 @@ public class ViewTabber extends FRoundedPanel {
// Assemble card pic viewer // Assemble card pic viewer
this.panelList = new ArrayList<JPanel>(); this.panelList = new ArrayList<JPanel>();
final String constraints = "wrap, insets 0, gap 0"; final String constraints = "wrap, insets 0 3% 0 0, gap 0";
this.pnlStack = new FPanel(); this.pnlStack = new FPanel();
this.pnlStack.setName("Stack"); this.pnlStack.setName("Stack");
@@ -127,7 +127,7 @@ public class ViewTabber extends FRoundedPanel {
this.setBackground(AllZone.getSkin().getClrTheme()); this.setBackground(AllZone.getSkin().getClrTheme());
this.setLayout(new MigLayout("insets 0, gap 0")); this.setLayout(new MigLayout("insets 0, gap 0"));
this.add(vtpTabber, "w 100%!, h 100%!"); this.add(vtpTabber, "w 97%!, h 100%!");
// After all components are in place, instantiate controller. // After all components are in place, instantiate controller.
this.control = new ControlTabber(this); this.control = new ControlTabber(this);
@@ -164,22 +164,23 @@ public class ViewTabber extends FRoundedPanel {
final Border border = new MatteBorder(0, 0, 1, 0, this.skin.getClrBorders()); final Border border = new MatteBorder(0, 0, 1, 0, this.skin.getClrBorders());
for (int i = stack.size() - 1; 0 <= i; i--) { for (int i = stack.size() - 1; 0 <= i; i--) {
final SpellAbilityStackInstance spell = stack.peekInstance(i);
isOptional = stack.peekAbility(i).isOptionalTrigger() isOptional = stack.peekAbility(i).isOptionalTrigger()
&& stack.peekAbility(i).getSourceCard().getController().isHuman() ? "(OPTIONAL) " : ""; && stack.peekAbility(i).getSourceCard().getController().isHuman() ? "(OPTIONAL) " : "";
txt = (count++) + ". " + isOptional + stack.peekInstance(i).getStackDescription(); txt = (count++) + ". " + isOptional + spell.getStackDescription();
tar = new JTextArea(txt); tar = new JTextArea(txt);
tar.setToolTipText(txt); tar.setToolTipText(txt);
tar.setOpaque(false); tar.setOpaque(false);
tar.setBorder(border); tar.setBorder(border);
tar.setFont(font); tar.setFont(font);
tar.setForeground(this.skin.getClrText()); tar.setForeground(this.skin.getClrText());
tar.setFocusable(false); tar.setFocusable(false);
tar.setEditable(false); tar.setEditable(false);
tar.setLineWrap(true); tar.setLineWrap(true);
tar.setWrapStyleWord(true); tar.setWrapStyleWord(true);
final SpellAbilityStackInstance spell = stack.peekInstance(i);
tar.addMouseListener(new MouseAdapter() { tar.addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseEntered(final MouseEvent e) { public void mouseEntered(final MouseEvent e) {
@@ -189,6 +190,10 @@ public class ViewTabber extends FRoundedPanel {
}); });
this.pnlStack.add(tar, "w 95%!, gapleft 3%, gaptop 1%"); this.pnlStack.add(tar, "w 95%!, gapleft 3%, gaptop 1%");
if (i == 0) {
AllZone.getDisplay().setCard(spell.getSourceCard());
}
} }
t.getInputController().getView().getBtnOK().requestFocusInWindow(); t.getInputController().getView().getBtnOK().requestFocusInWindow();