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

Improve layout of player details

Browse Source
This commit is contained in:
drdev
2014-10-14 04:16:07 +00:00
parent 0137bc5eaf
commit 8e06f8e2bc
1 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java
View File

@@ -31,30 +31,23 @@ public class PlayerDetailsPanel extends JPanel {
private PlayerView player; private PlayerView player;
// Info labels // Info labels
private FLabel lblHand = getBuiltFLabel(FSkinProp.IMG_ZONE_HAND, "99", "Cards in hand"); private FLabel lblHand = new DetailLabel(FSkinProp.IMG_ZONE_HAND, "99", "Cards in hand");
private FLabel lblGraveyard = getBuiltFLabel(FSkinProp.IMG_ZONE_GRAVEYARD, "99", "Cards in graveyard"); private FLabel lblGraveyard = new DetailLabel(FSkinProp.IMG_ZONE_GRAVEYARD, "99", "Cards in graveyard");
private FLabel lblLibrary = getBuiltFLabel(FSkinProp.IMG_ZONE_LIBRARY, "99", "Cards in library"); private FLabel lblLibrary = new DetailLabel(FSkinProp.IMG_ZONE_LIBRARY, "99", "Cards in library");
private FLabel lblExile = getBuiltFLabel(FSkinProp.IMG_ZONE_EXILE, "99", "Exiled cards"); private FLabel lblExile = new DetailLabel(FSkinProp.IMG_ZONE_EXILE, "99", "Exiled cards");
private FLabel lblFlashback = getBuiltFLabel(FSkinProp.IMG_ZONE_FLASHBACK, "99", "Flashback cards"); private FLabel lblFlashback = new DetailLabel(FSkinProp.IMG_ZONE_FLASHBACK, "99", "Flashback cards");
private FLabel lblPoison = getBuiltFLabel(FSkinProp.IMG_ZONE_POISON, "99", "Poison counters"); private FLabel lblPoison = new DetailLabel(FSkinProp.IMG_ZONE_POISON, "99", "Poison counters");
private final List<Pair<FLabel, Byte>> manaLabels = new ArrayList<Pair<FLabel,Byte>>(); private final List<Pair<DetailLabel, Byte>> manaLabels = new ArrayList<Pair<DetailLabel, Byte>>();
private FLabel getBuiltFLabel(FSkinProp p0, String s0, String s1) {
return new FLabel.Builder().icon(FSkin.getImage(p0))
.opaque(false).fontSize(14)
.fontStyle(Font.BOLD).iconInBackground()
.text(s0).tooltip(s1).fontAlign(SwingConstants.RIGHT).build();
}
public PlayerDetailsPanel(final PlayerView player) { public PlayerDetailsPanel(final PlayerView player) {
this.player = player; this.player = player;
manaLabels.add(Pair.of(getBuiltFLabel(FSkinProp.IMG_MANA_B, "99", "Black mana"), MagicColor.BLACK)); manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_B, "99", "Black mana"), MagicColor.BLACK));
manaLabels.add(Pair.of(getBuiltFLabel(FSkinProp.IMG_MANA_U, "99", "Blue mana"), MagicColor.BLUE)); manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_U, "99", "Blue mana"), MagicColor.BLUE));
manaLabels.add(Pair.of(getBuiltFLabel(FSkinProp.IMG_MANA_G, "99", "Green mana"), MagicColor.GREEN)); manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_G, "99", "Green mana"), MagicColor.GREEN));
manaLabels.add(Pair.of(getBuiltFLabel(FSkinProp.IMG_MANA_R, "99", "Red mana"), MagicColor.RED)); manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_R, "99", "Red mana"), MagicColor.RED));
manaLabels.add(Pair.of(getBuiltFLabel(FSkinProp.IMG_MANA_W, "99", "White mana"), MagicColor.WHITE)); manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_W, "99", "White mana"), MagicColor.WHITE));
manaLabels.add(Pair.of(getBuiltFLabel(FSkinProp.IMG_MANA_COLORLESS, "99", "Colorless mana"), (byte)0)); manaLabels.add(Pair.of(new DetailLabel(FSkinProp.IMG_MANA_COLORLESS, "99", "Colorless mana"), (byte)0));
setOpaque(false); setOpaque(false);
setLayout(new MigLayout("insets 0, gap 0, wrap")); setLayout(new MigLayout("insets 0, gap 0, wrap"));
@@ -65,8 +58,6 @@ public class PlayerDetailsPanel extends JPanel {
//updateDetails(); //updateDetails();
} }
/** Adds various labels to pool area JPanel container. */ /** Adds various labels to pool area JPanel container. */
private void populateDetails() { private void populateDetails() {
final SkinnedPanel row1 = new SkinnedPanel(new MigLayout("insets 0, gap 0")); final SkinnedPanel row1 = new SkinnedPanel(new MigLayout("insets 0, gap 0"));
@@ -84,7 +75,7 @@ public class PlayerDetailsPanel extends JPanel {
row6.setOpaque(false); row6.setOpaque(false);
// Hand, library, graveyard, exile, flashback, poison labels // Hand, library, graveyard, exile, flashback, poison labels
final String constraintsCell = "w 45%!, h 100%!, gap 0 5% 2px 2px"; final String constraintsCell = "w 50%-4px!, h 100%!, gapleft 2px, gapright 2px";
row1.add(lblHand, constraintsCell); row1.add(lblHand, constraintsCell);
row1.add(lblLibrary, constraintsCell); row1.add(lblLibrary, constraintsCell);
@@ -105,7 +96,7 @@ public class PlayerDetailsPanel extends JPanel {
row6.add(manaLabels.get(5).getLeft(), constraintsCell); row6.add(manaLabels.get(5).getLeft(), constraintsCell);
final String constraintsRow = "w 100%!, h 16%!"; final String constraintsRow = "w 100%!, h 16%!";
this.add(row1, constraintsRow + ", gap 0 0 4% 0"); this.add(row1, constraintsRow + ", gap 0 0 2% 0");
this.add(row2, constraintsRow); this.add(row2, constraintsRow);
this.add(row3, constraintsRow); this.add(row3, constraintsRow);
this.add(row4, constraintsRow); this.add(row4, constraintsRow);
@@ -129,7 +120,6 @@ public class PlayerDetailsPanel extends JPanel {
this.getLblExile().setText("" + player.getExileSize()); this.getLblExile().setText("" + player.getExileSize());
} }
/** /**
* Handles observer update of non-Zone details - life, poison, etc. Also * Handles observer update of non-Zone details - life, poison, etc. Also
* updates "players" panel in tabber for this player. * updates "players" panel in tabber for this player.
@@ -156,9 +146,10 @@ public class PlayerDetailsPanel extends JPanel {
* @param p0 &emsp; {@link forge.game.player.Player} * @param p0 &emsp; {@link forge.game.player.Player}
*/ */
public void updateManaPool() { public void updateManaPool() {
for (final Pair<FLabel, Byte> label : manaLabels) for (final Pair<DetailLabel, Byte> label : manaLabels) {
label.getKey().setText(Integer.toString(player.getMana(label.getRight()))); label.getKey().setText(Integer.toString(player.getMana(label.getRight())));
} }
}
public FLabel getLblHand() { public FLabel getLblHand() {
return this.lblHand; return this.lblHand;
@@ -168,10 +159,6 @@ public class PlayerDetailsPanel extends JPanel {
return this.lblLibrary; return this.lblLibrary;
} }
public final Iterable<Pair<FLabel, Byte>> getManaLabels() {
return manaLabels;
}
public FLabel getLblGraveyard() { public FLabel getLblGraveyard() {
return this.lblGraveyard; return this.lblGraveyard;
} }
@@ -188,18 +175,8 @@ public class PlayerDetailsPanel extends JPanel {
return this.lblPoison; return this.lblPoison;
} }
/**
* TODO: Write javadoc for this method.
* @param handAction
* @param libraryAction
* @param exileAction
* @param graveAction
* @param flashBackAction
* @param manaAction
*/
public void setupMouseActions(final ForgeAction handAction, final ForgeAction libraryAction, final ForgeAction exileAction, public void setupMouseActions(final ForgeAction handAction, final ForgeAction libraryAction, final ForgeAction exileAction,
final ForgeAction graveAction, final ForgeAction flashBackAction, final Function<Byte, Void> manaAction) { final ForgeAction graveAction, final ForgeAction flashBackAction, final Function<Byte, Void> manaAction) {
// Detail label listeners // Detail label listeners
lblGraveyard.setHoverable(true); lblGraveyard.setHoverable(true);
lblGraveyard.addMouseListener(new MouseAdapter() { @Override public void mousePressed(final MouseEvent e) { graveAction.actionPerformed(null); } } ); lblGraveyard.addMouseListener(new MouseAdapter() { @Override public void mousePressed(final MouseEvent e) { graveAction.actionPerformed(null); } } );
@@ -216,13 +193,40 @@ public class PlayerDetailsPanel extends JPanel {
lblFlashback.setHoverable(true); lblFlashback.setHoverable(true);
lblFlashback.addMouseListener(new MouseAdapter() { @Override public void mousePressed(final MouseEvent e) { flashBackAction.actionPerformed(null); } } ); lblFlashback.addMouseListener(new MouseAdapter() { @Override public void mousePressed(final MouseEvent e) { flashBackAction.actionPerformed(null); } } );
for(final Pair<FLabel, Byte> labelPair : getManaLabels()) { for (final Pair<DetailLabel, Byte> labelPair : manaLabels) {
labelPair.getLeft().setHoverable(true); labelPair.getLeft().setHoverable(true);
labelPair.getLeft().addMouseListener(new MouseAdapter() { @Override labelPair.getLeft().addMouseListener(new MouseAdapter() { @Override
public void mousePressed(final MouseEvent e) { public void mousePressed(final MouseEvent e) {
manaAction.apply(labelPair.getRight()); } } manaAction.apply(labelPair.getRight()); } }
); );
} }
}
@SuppressWarnings("serial")
private class DetailLabel extends FLabel {
private DetailLabel(FSkinProp p0, String s0, String s1) {
super(new FLabel.Builder().icon(FSkin.getImage(p0))
.opaque(false).fontSize(14)
.fontStyle(Font.BOLD).iconInBackground()
.text(s0).tooltip(s1).fontAlign(SwingConstants.RIGHT));
}
@Override
public void setText(String text0) {
super.setText(text0);
//adjust font size based on the text length to prevent it overlapping icon
switch (text0.length()) {
case 1:
setFontSize(14);
break;
case 2:
setFontSize(10);
break;
case 3:
setFontSize(8);
break;
}
}
} }
} }