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

Improve stack display so it feels more like a stack

Browse Source
This commit is contained in:
drdev
2014-07-20 22:23:30 +00:00
parent 78927eb7c4
commit 558d24c431
2 changed files with 57 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -934,10 +934,13 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
*/ */
@Override @Override
public Iterator<SpellAbilityStackInstance> iterator() { public Iterator<SpellAbilityStackInstance> iterator() {
// TODO Auto-generated method stub
return stack.iterator(); return stack.iterator();
} }
public Iterator<SpellAbilityStackInstance> reverseIterator() {
return stack.descendingIterator();
}
/** /**
* TODO: Write javadoc for this method. * TODO: Write javadoc for this method.
*/ */

90
forge-gui-mobile/src/forge/screens/match/views/VStack.java
View File

@@ -1,5 +1,7 @@
package forge.screens.match.views; package forge.screens.match.views;
import java.util.Iterator;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
@@ -34,7 +36,9 @@ import forge.util.Utils;
public class VStack extends FDropDown { public class VStack extends FDropDown {
public static final float CARD_WIDTH = Utils.AVG_FINGER_WIDTH; public static final float CARD_WIDTH = Utils.AVG_FINGER_WIDTH;
public static final float CARD_HEIGHT = Math.round(CARD_WIDTH * FCardPanel.ASPECT_RATIO); public static final float CARD_HEIGHT = Math.round(CARD_WIDTH * FCardPanel.ASPECT_RATIO);
public static final float BORDER_THICKNESS = Utils.scaleMin(2);
public static final float PADDING = Utils.scaleMin(3); public static final float PADDING = Utils.scaleMin(3);
public static final float MARGINS = Utils.scaleMin(4);
private static final FSkinFont FONT = FSkinFont.get(11); private static final FSkinFont FONT = FSkinFont.get(11);
private static final float ALPHA_COMPOSITE = 0.5f; private static final float ALPHA_COMPOSITE = 0.5f;
private static final TextRenderer textRenderer = new TextRenderer(true); private static final TextRenderer textRenderer = new TextRenderer(true);
@@ -82,31 +86,37 @@ public class VStack extends FDropDown {
clear(); clear();
float height; float height;
float x = PADDING; float x = MARGINS;
float y = PADDING; float y = MARGINS;
float dy = PADDING - 1;
float totalWidth = Math.min(4 * CARD_WIDTH, maxWidth); float totalWidth = Math.min(4 * CARD_WIDTH, maxWidth);
float width = totalWidth - 2 * PADDING; float width = totalWidth - 2 * MARGINS;
if (stack.isEmpty()) { //show label if stack empty if (stack.isEmpty()) { //show label if stack empty
FLabel label = add(new FLabel.Builder().text("[Empty]").font(FONT).align(HAlignment.CENTER).build()); FLabel label = add(new FLabel.Builder().text("[Empty]").font(FONT).align(HAlignment.CENTER).build());
height = Math.round(label.getAutoSizeBounds().height) + 2 * PADDING; height = Math.round(label.getAutoSizeBounds().height) + 2 * PADDING;
label.setBounds(x, y, width, height); label.setBounds(x, y, width, height);
return new ScrollBounds(totalWidth, y + height + PADDING); return new ScrollBounds(totalWidth, y + height + MARGINS);
} }
else { else {
StackInstanceDisplay display; //iterate stack in reverse so most recent items appear on bottom
boolean isTop = true; height = 0;
for (final SpellAbilityStackInstance stackInstance : stack) { float overlap = Math.round(CARD_HEIGHT / 2 + PADDING + BORDER_THICKNESS);
display = add(new StackInstanceDisplay(stackInstance, isTop)); Iterator<SpellAbilityStackInstance> iterator = stack.reverseIterator();
height = display.getMinHeight(width); while (true) {
display.setBounds(x, y, width, height); StackInstanceDisplay display = add(new StackInstanceDisplay(iterator.next(), width));
y += height + dy; if (iterator.hasNext()) { //make items have top half of card be overlapped
isTop = false; display.setBounds(x, y, width, overlap);
y += overlap;
}
else { //use full preferred height of display for bottom item on stack
display.setBounds(x, y, width, display.preferredHeight);
y += display.preferredHeight;
break;
} }
} }
return new ScrollBounds(totalWidth, y + 1); }
return new ScrollBounds(totalWidth, y + MARGINS);
} }
@Override @Override
@@ -119,8 +129,8 @@ public class VStack extends FDropDown {
//draw target arrows immediately above stack //draw target arrows immediately above stack
for (FDisplayObject child : getChildren()) { for (FDisplayObject child : getChildren()) {
Vector2 arrowOrigin = new Vector2( Vector2 arrowOrigin = new Vector2(
child.getLeft() + VStack.CARD_WIDTH * FCardPanel.TARGET_ORIGIN_FACTOR_X + VStack.PADDING, child.getLeft() + VStack.CARD_WIDTH * FCardPanel.TARGET_ORIGIN_FACTOR_X + VStack.PADDING + VStack.BORDER_THICKNESS,
child.getTop() + VStack.CARD_HEIGHT * FCardPanel.TARGET_ORIGIN_FACTOR_Y + VStack.PADDING); child.getTop() + VStack.CARD_HEIGHT * FCardPanel.TARGET_ORIGIN_FACTOR_Y + VStack.PADDING + VStack.BORDER_THICKNESS);
if (arrowOrigin.y < 0) { if (arrowOrigin.y < 0) {
continue; //don't draw arrow scrolled off top continue; //don't draw arrow scrolled off top
@@ -145,13 +155,12 @@ public class VStack extends FDropDown {
private class StackInstanceDisplay extends FDisplayObject { private class StackInstanceDisplay extends FDisplayObject {
private final SpellAbilityStackInstance stackInstance; private final SpellAbilityStackInstance stackInstance;
private final boolean isTop;
private final Color foreColor, backColor; private final Color foreColor, backColor;
private String text; private String text;
private float preferredHeight;
private StackInstanceDisplay(SpellAbilityStackInstance stackInstance0, boolean isTop0) { private StackInstanceDisplay(SpellAbilityStackInstance stackInstance0, float width) {
stackInstance = stackInstance0; stackInstance = stackInstance0;
isTop = isTop0;
Card card = stackInstance.getSourceCard(); Card card = stackInstance.getSourceCard();
text = stackInstance.getStackDescription(); text = stackInstance.getStackDescription();
@@ -163,14 +172,12 @@ public class VStack extends FDropDown {
DetailColors color = CardDetailUtil.getBorderColor(card, !stackInstance.getStackDescription().startsWith("Morph ")); DetailColors color = CardDetailUtil.getBorderColor(card, !stackInstance.getStackDescription().startsWith("Morph "));
backColor = FSkinColor.fromRGB(color.r, color.g, color.b); backColor = FSkinColor.fromRGB(color.r, color.g, color.b);
foreColor = FSkinColor.getHighContrastColor(backColor); foreColor = FSkinColor.getHighContrastColor(backColor);
}
private float getMinHeight(float width) {
width -= CARD_WIDTH; //account for card picture width -= CARD_WIDTH; //account for card picture
width -= 3 * PADDING; //account for left and right insets and gap between picture and text width -= 3 * PADDING + 2 * BORDER_THICKNESS; //account for left and right insets and gap between picture and text
float height = Math.max(CARD_HEIGHT, textRenderer.getWrappedBounds(text, FONT, width).height); float height = Math.max(CARD_HEIGHT, textRenderer.getWrappedBounds(text, FONT, width).height);
height += 2 * PADDING; height += 2 * (PADDING + BORDER_THICKNESS);
return Math.round(height); preferredHeight = Math.round(height);
} }
public SpellAbilityStackInstance getStackInstance() { public SpellAbilityStackInstance getStackInstance() {
@@ -235,29 +242,38 @@ public class VStack extends FDropDown {
@Override @Override
public void draw(Graphics g) { public void draw(Graphics g) {
float x = 0;
float y = 0;
float w = getWidth(); float w = getWidth();
float h = getHeight(); float h = preferredHeight;
if (!isTop) { boolean needAlpha = h > getHeight();
if (needAlpha) { //use alpha for cards below top of stack
g.setAlphaComposite(ALPHA_COMPOSITE); g.setAlphaComposite(ALPHA_COMPOSITE);
} }
g.fillRect(backColor, 0, 0, w, h); g.startClip(0, 0, w, getHeight()); //clip based on actual height
float padding = PADDING; g.fillRect(Color.BLACK, x, y, w, h); //draw rectangle for border
float cardWidth = CARD_WIDTH;
float cardHeight = CARD_HEIGHT;
float x = padding;
float y = padding;
CardRenderer.drawCardWithOverlays(g, stackInstance.getSourceCard(), x, y, cardWidth, cardHeight); x += BORDER_THICKNESS;
y += BORDER_THICKNESS;
w -= 2 * BORDER_THICKNESS;
h -= 2 * BORDER_THICKNESS;
g.fillRect(backColor, x, y, w, h);
x += cardWidth + padding; x += PADDING;
w -= x + padding; y += PADDING;
h -= y + padding; CardRenderer.drawCardWithOverlays(g, stackInstance.getSourceCard(), x, y, CARD_WIDTH, CARD_HEIGHT);
x += CARD_WIDTH + PADDING;
w -= x + PADDING;
h -= y + PADDING;
textRenderer.drawText(g, text, FONT, foreColor, x, y, w, h, y, h, true, HAlignment.LEFT, true); textRenderer.drawText(g, text, FONT, foreColor, x, y, w, h, y, h, true, HAlignment.LEFT, true);
if (!isTop) { g.endClip();
if (needAlpha) {
g.resetAlphaComposite(); g.resetAlphaComposite();
} }
} }