github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed card highlighting

Browse source 
* Changed CardPanelRenderImpl to correctly invalidate its render when its panel has its isChoosable / isSelected override set. Before things like selecting cards in a draft view would not visibly have an effect as the render wasn't invalidated.
This commit is contained in:
Mark Langen 2016-09-06 18:15:37 -06:00
parent f9e088b51d
commit 0ea9d33211
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java
View file

@ -378,6 +378,24 @@ public class CardPanelRenderImpl extends CardPanel {
}
}
@Override
public void setSelected(boolean selected) {
if (selected != isSelected()) {
super.setSelected(selected);
// Invalidate our render
cardImage = null;
}
}
@Override
public void setChoosable(boolean choosable) {
if (choosable != isChoosable()) {
super.setChoosable(choosable);
// Invalidate our render
cardImage = null;
}
}
@Override
public Image getImage() {
if (artImage != null) {

13
Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java
View file

@ -227,10 +227,6 @@ public class ModernCardRenderer extends CardRenderer {
@Override
protected void drawBorder(Graphics2D g) {
// Draw border as one rounded rectangle
g.setColor(Color.black);
g.fillRoundRect(0, 0, cardWidth, cardHeight, cornerRadius, cornerRadius);
// Selection Borders
Color borderColor;
if (isSelected) {
@ -242,8 +238,14 @@ public class ModernCardRenderer extends CardRenderer {
} else if (cardView instanceof PermanentView && ((PermanentView) cardView).isCanAttack()) {
borderColor = new Color(0, 0, 255, 230);
} else {
borderColor = null;
borderColor = Color.BLACK;
}
// Draw border as one rounded rectangle
g.setColor(borderColor);
g.fillRoundRect(0, 0, cardWidth, cardHeight, cornerRadius, cornerRadius);
/* // Separate selection highlight border from card itself. Not used right now
if (borderColor != null) {
float hwidth = borderWidth / 2.0f;
Graphics2D g2 = (Graphics2D) g.create();
@ -257,6 +259,7 @@ public class ModernCardRenderer extends CardRenderer {
g2.draw(rect);
g2.dispose();
}
*/
}
@Override