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

Fixed massive repaint bug, hopefully also simultaneously cleared up memory leak.

Browse Source
This commit is contained in:
Doublestrike
2011-11-30 08:27:35 +00:00
parent dc98c41dfc
commit c67127f44b
1 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/main/java/forge/view/match/ViewField.java
View File

@@ -22,7 +22,9 @@ import java.awt.Component;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Font; import java.awt.Font;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.GridBagConstraints; import java.awt.Image;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.HashMap; import java.util.HashMap;
@@ -69,7 +71,7 @@ public class ViewField extends FRoundedPanel {
private PhaseLabel lblUpkeep, lblDraw, lblBeginCombat, lblEndCombat, lblEndTurn; private PhaseLabel lblUpkeep, lblDraw, lblBeginCombat, lblEndCombat, lblEndTurn;
private JLabel lblLife; private JLabel lblAvatar, lblLife;
private Map<String, JLabel> keywordLabels; private Map<String, JLabel> keywordLabels;
private final Color transparent = new Color(0, 0, 0, 0); private final Color transparent = new Color(0, 0, 0, 0);
@@ -102,10 +104,6 @@ public class ViewField extends FRoundedPanel {
this.tabletop.setBorder(new MatteBorder(0, 1, 0, 0, this.skin.getClrBorders())); this.tabletop.setBorder(new MatteBorder(0, 1, 0, 0, this.skin.getClrBorders()));
this.tabletop.setOpaque(false); this.tabletop.setOpaque(false);
final GridBagConstraints gbc = new GridBagConstraints();
gbc.fill = GridBagConstraints.BOTH;
//
final Avatar pic = new Avatar("res/pics/icons/unknown.jpg"); final Avatar pic = new Avatar("res/pics/icons/unknown.jpg");
final Details pool = new Details(); final Details pool = new Details();
@@ -354,15 +352,26 @@ public class ViewField extends FRoundedPanel {
* Shows user icon, keywords, and phase for this field. * Shows user icon, keywords, and phase for this field.
*/ */
private class Avatar extends FPanel { private class Avatar extends FPanel {
private final ImageIcon icon; private final Image img;
private final Color transparent = new Color(0, 0, 0, 0);
public Avatar(final String filename) { public Avatar(final String filename) {
// Panel and background image icon init // Panel and background image icon init
super(); super();
this.setOpaque(false); this.setOpaque(false);
this.setLayout(new MigLayout("fill, wrap, insets 0, gap 0")); this.setLayout(new MigLayout("fill, wrap, insets 0, gap 0"));
this.icon = new ImageIcon(filename); this.img = new ImageIcon(filename).getImage();
// Resize adapter
this.addComponentListener(new ComponentAdapter() {
@Override
public void componentResized(ComponentEvent e) {
lblLife.setFont(ViewField.this.skin.getFont1().deriveFont(Font.PLAIN, (getWidth() / 4)));
lblAvatar.setIcon(new ImageIcon(img.getScaledInstance(getWidth(), getWidth(), java.awt.Image.SCALE_SMOOTH)));
}
});
lblAvatar = new JLabel();
this.add(lblAvatar, "w 100%!, wrap");
// Life label // Life label
ViewField.this.lblLife = new JLabel("--"); ViewField.this.lblLife = new JLabel("--");
@@ -387,7 +396,7 @@ public class ViewField extends FRoundedPanel {
ViewField.this.lblLife.setBorder(ViewField.this.inactiveBorder); ViewField.this.lblLife.setBorder(ViewField.this.inactiveBorder);
} }
}); });
this.add(ViewField.this.lblLife, "w 100%!, dock north"); this.add(ViewField.this.lblLife, "w 100%!, wrap");
ViewField.this.keywordLabels = new HashMap<String, JLabel>(); ViewField.this.keywordLabels = new HashMap<String, JLabel>();
// TODO link these map keys to correct keyword constant // TODO link these map keys to correct keyword constant
@@ -420,8 +429,7 @@ public class ViewField extends FRoundedPanel {
phase.setLayout(new MigLayout("fillx, insets 0, gap 0")); phase.setLayout(new MigLayout("fillx, insets 0, gap 0"));
this.add(phase, "w 100%!, h 20px!"); this.add(phase, "w 100%!, h 20px!");
// Constraints string must be set once, for ease and also // Constraints string, set once
// since dynamic sizing is buggy.
final String constraints = "w 20%!, h 100%!"; final String constraints = "w 20%!, h 100%!";
ViewField.this.lblUpkeep = new PhaseLabel("UP"); ViewField.this.lblUpkeep = new PhaseLabel("UP");
@@ -444,16 +452,6 @@ public class ViewField extends FRoundedPanel {
ViewField.this.lblEndTurn.setToolTipText("<html>Phase: End Turn<br>Click to toggle.</html>"); ViewField.this.lblEndTurn.setToolTipText("<html>Phase: End Turn<br>Click to toggle.</html>");
phase.add(ViewField.this.lblEndTurn, constraints); phase.add(ViewField.this.lblEndTurn, constraints);
} }
@Override
public void paintComponent(final Graphics g) {
super.paintComponent(g);
this.setBorder(new MatteBorder(this.getWidth(), 0, 0, 0, this.transparent));
g.drawImage(this.icon.getImage(), 0, 0, this.getWidth(), this.getWidth(), 0, 0, this.icon.getIconWidth(),
this.icon.getIconHeight(), null);
ViewField.this.lblLife
.setFont(ViewField.this.skin.getFont1().deriveFont(Font.PLAIN, (this.getWidth() / 4)));
}
} }
/** /**
@@ -569,6 +567,15 @@ public class ViewField extends FRoundedPanel {
} }
this.setBackground(this.defaultBG); this.setBackground(this.defaultBG);
// Resize adapter
this.addComponentListener(new ComponentAdapter() {
@Override
public void componentResized(ComponentEvent e) {
setFont(ViewField.this.skin.getFont1().deriveFont(Font.PLAIN, (getHeight() / 2)));
}
});
// Hover effect
this.madHover = new MouseAdapter() { this.madHover = new MouseAdapter() {
@Override @Override
public void mouseEntered(final MouseEvent e) { public void mouseEntered(final MouseEvent e) {
@@ -610,7 +617,6 @@ public class ViewField extends FRoundedPanel {
g.fillRect(0, 0, this.w, this.h); g.fillRect(0, 0, this.w, this.h);
g.setColor(this.clrBorders); g.setColor(this.clrBorders);
g.drawRect(0, 0, this.w - 1, this.h - 1); g.drawRect(0, 0, this.w - 1, this.h - 1);
this.setFont(ViewField.this.skin.getFont1().deriveFont(Font.PLAIN, (this.h / 2)));
super.paintComponent(g); super.paintComponent(g);
} }
} }
@@ -668,6 +674,14 @@ public class ViewField extends FRoundedPanel {
PhaseLabel.this.repaint(); PhaseLabel.this.repaint();
} }
}); });
// Resize adapter
this.addComponentListener(new ComponentAdapter() {
@Override
public void componentResized(ComponentEvent e) {
setFont(new Font("TAHOMA", Font.PLAIN, (getWidth() / 2)));
}
});
} }
/** /**
@@ -736,8 +750,6 @@ public class ViewField extends FRoundedPanel {
// Center vertically and horizontally. Show border if active. // Center vertically and horizontally. Show border if active.
g.setColor(c); g.setColor(c);
g.fillRoundRect(1, 1, w - 2, h - 2, 5, 5); g.fillRoundRect(1, 1, w - 2, h - 2, 5, 5);
this.setFont(new Font("TAHOMA", Font.PLAIN, (w / 2)));
g.setColor(Color.black); g.setColor(Color.black);
super.paintComponent(g); super.paintComponent(g);
} }