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

Improve appearance of group headers

Browse Source 
Allow deselecting cards in image view
This commit is contained in:
drdev
2014-02-04 17:25:28 +00:00
parent 444aad2034
commit a2287aff5b
2 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ImageView.java
View File

@@ -7,6 +7,7 @@ import java.awt.Graphics;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Insets; import java.awt.Insets;
import java.awt.Point; import java.awt.Point;
import java.awt.Polygon;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.RenderingHints; import java.awt.RenderingHints;
import java.awt.Shape; import java.awt.Shape;
@@ -31,6 +32,8 @@ import forge.gui.match.controllers.CPicture;
import forge.gui.toolbox.FMouseAdapter; import forge.gui.toolbox.FMouseAdapter;
import forge.gui.toolbox.FScrollPane; import forge.gui.toolbox.FScrollPane;
import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin;
import forge.gui.toolbox.FSkin.SkinColor;
import forge.gui.toolbox.FSkin.SkinFont;
import forge.gui.toolbox.FSkin.SkinImage; import forge.gui.toolbox.FSkin.SkinImage;
import forge.gui.toolbox.itemmanager.ItemManager; import forge.gui.toolbox.itemmanager.ItemManager;
import forge.gui.toolbox.itemmanager.ItemManagerModel; import forge.gui.toolbox.itemmanager.ItemManagerModel;
@@ -41,7 +44,11 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
private static final int PADDING = 5; private static final int PADDING = 5;
private static final float GAP_SCALE_FACTOR = 0.04f; private static final float GAP_SCALE_FACTOR = 0.04f;
private static final float PILE_SPACING_Y = 0.1f; private static final float PILE_SPACING_Y = 0.1f;
private static final SkinColor GROUP_HEADER_FORE_COLOR = FSkin.getColor(FSkin.Colors.CLR_TEXT);
private static final SkinColor GROUP_HEADER_LINE_COLOR = GROUP_HEADER_FORE_COLOR.alphaColor(120);
private static final SkinFont GROUP_HEADER_FONT = FSkin.getFont(12);
private static final int GROUP_HEADER_HEIGHT = 19; private static final int GROUP_HEADER_HEIGHT = 19;
private static final int GROUP_HEADER_GLYPH_WIDTH = 6;
private final CardViewDisplay display; private final CardViewDisplay display;
private List<Integer> selectedIndices = new ArrayList<Integer>(); private List<Integer> selectedIndices = new ArrayList<Integer>();
@@ -107,7 +114,13 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
focus(); focus();
ItemInfo item = getItemAtPoint(e.getPoint()); ItemInfo item = getItemAtPoint(e.getPoint());
if (item == null) { return false; } if (item == null) {
if (!e.isControlDown() && !e.isShiftDown()) {
clearSelection();
onSelectionChange();
}
return false;
}
if (item.selected) { if (item.selected) {
//toggle selection off item if Control down and left mouse down, otherwise do nothing //toggle selection off item if Control down and left mouse down, otherwise do nothing
@@ -243,10 +256,10 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
private void updateLayout(boolean forRefresh) { private void updateLayout(boolean forRefresh) {
int x, groupY, pileY, pileHeight, maxPileHeight; int x, groupY, pileY, pileHeight, maxPileHeight;
int y = PADDING; int y = PADDING;
int groupX = groupBy == null ? 0 : PADDING; int groupX = PADDING;
int itemAreaWidth = getVisibleSize().width; int itemAreaWidth = getVisibleSize().width;
int groupWidth = itemAreaWidth - 2 * groupX; int groupWidth = itemAreaWidth - 2 * groupX;
int pileX = groupBy == null ? PADDING : 2 * PADDING + 1; int pileX = PADDING;
int pileWidth = itemAreaWidth - 2 * pileX; int pileWidth = itemAreaWidth - 2 * pileX;
int itemWidth = 50 * imageScaleFactor; int itemWidth = 50 * imageScaleFactor;
@@ -345,9 +358,6 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
y = pileY + maxPileHeight; //update y for setting group height below y = pileY + maxPileHeight; //update y for setting group height below
} }
if (groupBy != null) {
y += PADDING + 1; //leave room for group footer
}
group.setBounds(groupX, groupY, groupWidth, y - groupY); group.setBounds(groupX, groupY, groupWidth, y - groupY);
y += PADDING; y += PADDING;
} }
@@ -664,7 +674,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
final int visibleTop = getScroller().getVerticalScrollBar().getValue(); final int visibleTop = getScroller().getVerticalScrollBar().getValue();
final int visibleBottom = visibleTop + visibleSize.height; final int visibleBottom = visibleTop + visibleSize.height;
FSkin.setGraphicsFont(g2d, ItemListView.ROW_FONT); FSkin.setGraphicsFont(g2d, GROUP_HEADER_FONT);
FontMetrics fm = g2d.getFontMetrics(); FontMetrics fm = g2d.getFontMetrics();
int fontOffsetY = (GROUP_HEADER_HEIGHT - fm.getHeight()) / 2 + fm.getAscent(); int fontOffsetY = (GROUP_HEADER_HEIGHT - fm.getHeight()) / 2 + fm.getAscent();
@@ -677,41 +687,45 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
} }
if (groupBy != null) { if (groupBy != null) {
Rectangle bounds = group.getBounds(); Rectangle bounds = group.getBounds();
FSkin.setGraphicsColor(g2d, ItemListView.HEADER_BACK_COLOR);
g2d.fillRect(bounds.x, bounds.y, bounds.width, GROUP_HEADER_HEIGHT - 1); //draw header background and border if hovered
FSkin.setGraphicsColor(g2d, ItemListView.FORE_COLOR); //TODO: Uncomment
g2d.drawString(group.name + " (" + group.items.size() + ")", bounds.x + PADDING, bounds.y + fontOffsetY); //FSkin.setGraphicsColor(g2d, ItemListView.HEADER_BACK_COLOR);
//g2d.fillRect(bounds.x, bounds.y, bounds.width, GROUP_HEADER_HEIGHT - 1);
//FSkin.setGraphicsColor(g2d, ItemListView.GRID_COLOR);
//g2d.drawRect(bounds.x, bounds.y, bounds.width - 1, GROUP_HEADER_HEIGHT - 1);
//draw group name and horizontal line
int x = bounds.x + GROUP_HEADER_GLYPH_WIDTH + PADDING + 1;
int y = bounds.y + fontOffsetY;
FSkin.setGraphicsColor(g2d, GROUP_HEADER_FORE_COLOR);
String caption = group.name + " (" + group.items.size() + ")";
g2d.drawString(caption, x, y);
x += fm.stringWidth(caption) + PADDING;
y = bounds.y + GROUP_HEADER_HEIGHT / 2;
FSkin.setGraphicsColor(g2d, GROUP_HEADER_LINE_COLOR);
g2d.drawLine(x, y, bounds.x + bounds.width - 1, y);
if (!group.items.isEmpty()) { //draw expand/collapse glyph as long as group isn't empty if (!group.items.isEmpty()) { //draw expand/collapse glyph as long as group isn't empty
int offset = GROUP_HEADER_HEIGHT / 4; Polygon glyph = new Polygon();
int x1 = bounds.x + bounds.width - PADDING; int offset = GROUP_HEADER_GLYPH_WIDTH / 2 + 1;
int x2 = x1 - offset; x = bounds.x + offset;
int x3 = x2 - offset;
int y2 = bounds.y + GROUP_HEADER_HEIGHT / 2;
if (!group.isCollapsed) {
offset *= -1;
y2++;
}
int y1 = y2 - offset;
g2d.drawLine(x1, y1, x2, y2);
g2d.drawLine(x2, y2, x3, y1);
if (group.isCollapsed) { if (group.isCollapsed) {
offset++; y++;
glyph.addPoint(x, y - offset);
glyph.addPoint(x + offset, y);
glyph.addPoint(x, y + offset);
} }
else { else {
offset--; glyph.addPoint(x - offset + 2, y + offset - 1);
glyph.addPoint(x + offset, y + offset - 1);
glyph.addPoint(x + offset, y - offset + 1);
} }
y1 += offset; g2d.fill(glyph);
y2 += offset;
g2d.drawLine(x1, y1, x2, y2);
g2d.drawLine(x2, y2, x3, y1);
} }
FSkin.setGraphicsColor(g2d, ItemListView.GRID_COLOR);
g2d.drawRect(bounds.x, bounds.y, bounds.width - 1, bounds.height - 1);
if (group.isCollapsed || group.items.isEmpty()) { if (group.isCollapsed || group.items.isEmpty()) {
continue; continue;
} }
int y = bounds.y + GROUP_HEADER_HEIGHT - 1; //draw bottom border of header
g2d.drawLine(bounds.x, y, bounds.x + bounds.width - 1, y);
} }
else if (group.items.isEmpty()) { else if (group.items.isEmpty()) {
continue; continue;

8
forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemListView.java
View File

@@ -78,14 +78,14 @@ import forge.item.InventoryItem;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public final class ItemListView<T extends InventoryItem> extends ItemView<T> { public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
static final SkinColor BACK_COLOR = FSkin.getColor(FSkin.Colors.CLR_ZEBRA); static final SkinColor BACK_COLOR = FSkin.getColor(FSkin.Colors.CLR_ZEBRA);
static final SkinColor FORE_COLOR = FSkin.getColor(FSkin.Colors.CLR_TEXT); private static final SkinColor FORE_COLOR = FSkin.getColor(FSkin.Colors.CLR_TEXT);
private static final SkinColor SEL_ACTIVE_COLOR = FSkin.getColor(FSkin.Colors.CLR_ACTIVE); private static final SkinColor SEL_ACTIVE_COLOR = FSkin.getColor(FSkin.Colors.CLR_ACTIVE);
private static final SkinColor SEL_INACTIVE_COLOR = FSkin.getColor(FSkin.Colors.CLR_INACTIVE); private static final SkinColor SEL_INACTIVE_COLOR = FSkin.getColor(FSkin.Colors.CLR_INACTIVE);
static final SkinColor HEADER_BACK_COLOR = BACK_COLOR.getContrastColor(-10); private static final SkinColor HEADER_BACK_COLOR = BACK_COLOR.getContrastColor(-10);
static final SkinColor ALT_ROW_COLOR = BACK_COLOR.getContrastColor(-20); static final SkinColor ALT_ROW_COLOR = BACK_COLOR.getContrastColor(-20);
static final SkinColor GRID_COLOR = BACK_COLOR.getContrastColor(20); private static final SkinColor GRID_COLOR = BACK_COLOR.getContrastColor(20);
private static final SkinBorder HEADER_BORDER = new FSkin.CompoundSkinBorder(new FSkin.MatteSkinBorder(0, 0, 1, 1, GRID_COLOR), new EmptyBorder(0, 1, 0, 0)); private static final SkinBorder HEADER_BORDER = new FSkin.CompoundSkinBorder(new FSkin.MatteSkinBorder(0, 0, 1, 1, GRID_COLOR), new EmptyBorder(0, 1, 0, 0));
static final SkinFont ROW_FONT = FSkin.getFont(12); private static final SkinFont ROW_FONT = FSkin.getFont(12);
private static final int ROW_HEIGHT = 19; private static final int ROW_HEIGHT = 19;
private final ItemTable table = new ItemTable(); private final ItemTable table = new ItemTable();