diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index 212139ff0d4..23ae98f4e27 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -438,7 +438,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { return; } cardInfoPane.setLocation(40, 40); - cardInfoPane.setBackground(new Color(0, 0, 0, 0)); + cardInfoPane.setBackground(new Color(0, 0, 0, 255)); // use non-transparent background to full draw, see bug example in #12261 UI.addComponent(MageComponents.CARD_INFO_PANE, cardInfoPane); MageRoundPane popupContainer = new MageRoundPane(); diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/UI.java b/Mage.Client/src/main/java/org/mage/card/arcane/UI.java index fb29df38351..343410c8527 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/UI.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/UI.java @@ -79,6 +79,7 @@ public final class UI { if (true) return; // TODO: wtf, is it used to display images by url?! Remove that code after few releases if no bug reports, 27.11.2023 + // TODO: is it place to implement emoji? editorPane.getDocument().putProperty("imageCache", imageCache); // Read internally by ImageView, but never written. editorPane.setEditorKit(new HTMLEditorKit() { private static final long serialVersionUID = -54602188235105448L; diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java index 1817e11f9f3..2ce167a178d 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java @@ -24,7 +24,6 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane { public static final int TOOLTIP_BORDER_WIDTH = 80; - private CardView currentCard; private int type; private int addWidth; @@ -51,8 +50,6 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane { @Override public void setCard(final CardView card, final Component container) { - currentCard = card; - try { SwingUtilities.invokeLater(() -> { TextLines textLines = GuiDisplayUtil.getTextLinesfromCardView(card); @@ -68,6 +65,7 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane { } private void resizeTooltipIfNeeded(Component container, int ruleLength, int rules) { + // TODO: fix bug with long image path here? if (container == null) { return; } @@ -97,9 +95,4 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane { addHeight + TOOLTIP_HEIGHT_MIN); } } - - @Override - public boolean isCurrentCard(CardView card) { - return currentCard != null && currentCard.equals(card); - } } diff --git a/Mage.Common/src/main/java/mage/components/CardInfoPane.java b/Mage.Common/src/main/java/mage/components/CardInfoPane.java index 36f8024153e..4a28e1937e8 100644 --- a/Mage.Common/src/main/java/mage/components/CardInfoPane.java +++ b/Mage.Common/src/main/java/mage/components/CardInfoPane.java @@ -5,7 +5,7 @@ import mage.view.CardView; import java.awt.*; /** - * Card info pane for displaying card rules. + * GUI: card info pane for displaying card rules. * Supports drawing mana symbols. * * @author nantuko @@ -13,5 +13,5 @@ import java.awt.*; public interface CardInfoPane { void setCard(CardView card, Component container); - boolean isCurrentCard (CardView card); + }