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

better layout for card type and p/t in card detail pane

Browse Source
This commit is contained in:
pfps
2017-02-05 14:22:00 +00:00
parent 443ac7853c
commit 9da848ed4b
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java
View File

@@ -78,10 +78,10 @@ public class CardDetailPanel extends SkinnedPanel {
setLayout(null); setLayout(null);
setOpaque(false); setOpaque(false);
nameCostLabel = new FLabel.Builder().fontAlign(SwingConstants.CENTER).build(); nameCostLabel = new FLabel.Builder().fontAlign(SwingConstants.CENTER).tooltip("Card Name and Cost").build();
typeLabel = new FLabel.Builder().fontAlign(SwingConstants.CENTER).build(); typeLabel = new FLabel.Builder().fontAlign(SwingConstants.CENTER).tooltip("Card Type").build();
idLabel = new FLabel.Builder().fontAlign(SwingConstants.LEFT).tooltip("Card ID").build(); idLabel = new FLabel.Builder().fontAlign(SwingConstants.LEFT).tooltip("Card ID").build();
powerToughnessLabel = new FLabel.Builder().fontAlign(SwingConstants.CENTER).build(); powerToughnessLabel = new FLabel.Builder().fontAlign(SwingConstants.CENTER).tooltip("Card P/T or Loyalty").build();
setInfoLabel = new JLabel(); setInfoLabel = new JLabel();
setInfoLabel.setHorizontalAlignment(SwingConstants.CENTER); setInfoLabel.setHorizontalAlignment(SwingConstants.CENTER);
@@ -99,8 +99,8 @@ public class CardDetailPanel extends SkinnedPanel {
add(nameCostLabel); add(nameCostLabel);
add(typeLabel); add(typeLabel);
add(idLabel); add(idLabel);
add(powerToughnessLabel);
add(setInfoLabel); add(setInfoLabel);
add(powerToughnessLabel);
add(scrArea); add(scrArea);
} }
@@ -115,21 +115,23 @@ public class CardDetailPanel extends SkinnedPanel {
final int x = insets; final int x = insets;
int y = insets; int y = insets;
final int lineWidth = getWidth() - 2 * insets; final int lineWidth = getWidth() - 2 * insets;
final int lineHeight = nameCostLabel.getPreferredSize().height; // final int lineHeight = nameCostLabel.getPreferredSize().height;
final int dy = lineHeight + 1; // final int dy = lineHeight + 1;
nameCostLabel.setBounds(x, y, lineWidth, lineHeight); int areaHeight = nameCostLabel.getPreferredSize().height;
y += dy; nameCostLabel.setBounds(x, y, lineWidth, areaHeight);
y += areaHeight + 1 ;
typeLabel.setBounds(x, y, lineWidth, lineHeight); areaHeight = typeLabel.getPreferredSize().height;
y += dy; typeLabel.setBounds(x, y, lineWidth, areaHeight);
y += areaHeight + 1 ;
idLabel.setBounds(x, y, idLabel.getAutoSizeWidth(), lineHeight);
powerToughnessLabel.setBounds(x, y, lineWidth, lineHeight);
areaHeight = idLabel.getPreferredSize().height;
idLabel.setBounds(x, y, idLabel.getAutoSizeWidth(), areaHeight);
powerToughnessLabel.setBounds(x, y, lineWidth, areaHeight);
//+1 to x,y so set info label right up against border and the baseline matches ID and P/T //+1 to x,y so set info label right up against border and the baseline matches ID and P/T
setInfoLabel.setBounds(x + lineWidth - setInfoWidth + 1, y + 1, setInfoWidth, lineHeight); setInfoLabel.setBounds(x + lineWidth - setInfoWidth + 1, y + 1, setInfoWidth, areaHeight);
y += dy; y += areaHeight + 1 ;
scrArea.setBounds(0, y, getWidth(), getHeight() - y); scrArea.setBounds(0, y, getWidth(), getHeight() - y);
} }