External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

GUI: improved ability picker, added card popup support (closes #6678)

Browse source
This commit is contained in:
Oleg Agafonov 2023-11-29 03:08:48 +04:00
parent 491c9cbe04
commit 9c6fc4187f
2 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage.Client/src/main/java/mage/client/components/ColorPane.java
View file

@ -1,5 +1,8 @@
package mage.client.components;
import mage.client.components.ability.BackgroundPainter;
import org.jdesktop.swingx.JXPanel;
import javax.swing.*;
import java.awt.*;
@ -28,6 +31,14 @@ public class ColorPane extends MageEditorPane {
add(jPanel);
}
public void setExtBackgroundColor(BackgroundPainter backgroundPainter) {
setBackground(new Color(0, 0, 0, 0));
JXPanel jPanel = new JXPanel();
jPanel.setBackgroundPainter(backgroundPainter);
setLayout(new BorderLayout());
add(jPanel);
}
/**
* A little trick to paint black background under the text.
*

18
Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java
View file

@ -2,6 +2,8 @@ package mage.client.components.ability;
import mage.abilities.Modes;
import mage.client.SessionHandler;
import mage.client.cards.BigCard;
import mage.client.components.ColorPane;
import mage.client.dialog.MageDialog;
import mage.client.game.GamePanel;
import mage.client.util.ImageHelper;
@ -38,12 +40,11 @@ public class AbilityPicker extends JXPanel implements MouseWheelListener {
private List<Object> choices;
private String message = DEFAULT_MESSAGE;
private Session session;
private UUID gameId;
private BackgroundPainter mwPanelPainter;
private JScrollPane jScrollPane2;
private JLabel title;
private ColorPane title;
private Image rightImage;
private Image rightImageHovered;
@ -79,8 +80,9 @@ public class AbilityPicker extends JXPanel implements MouseWheelListener {
jScrollPane2.getVerticalScrollBar().setUI(new MageScrollbarUI());
}
public void init(UUID gameId) {
public void init(UUID gameId, BigCard bigCard) {
this.gameId = gameId;
this.title.setGameData(gameId, bigCard);
}
public void cleanUp() {
@ -129,9 +131,15 @@ public class AbilityPicker extends JXPanel implements MouseWheelListener {
setBackground(textColor);
setBackgroundPainter(mwPanelPainter);
title = new JLabel();
title = new ColorPane();
title.setFont(new Font("Times New Roman", 1, 15));
title.setEditable(false);
title.setFocusCycleRoot(false);
title.setOpaque(false);
title.setForeground(textColor);
title.setExtBackgroundColor(mwPanelPainter);
title.setBorder(BorderFactory.createEmptyBorder());
title.enableHyperlinksAndCardPopups();
title.setText(message);
jScrollPane2.setBorder(null);
@ -179,7 +187,7 @@ public class AbilityPicker extends JXPanel implements MouseWheelListener {
GroupLayout.TRAILING,
layout.createSequentialGroup().addContainerGap().add(
layout.createParallelGroup(GroupLayout.TRAILING).add(GroupLayout.LEADING, jScrollPane2, GroupLayout.DEFAULT_SIZE, 422, Short.MAX_VALUE).add(GroupLayout.LEADING,
layout.createSequentialGroup().add(title).addPreferredGap(LayoutStyle.RELATED, 175, Short.MAX_VALUE).add(1, 1, 1)).add(
layout.createSequentialGroup().add(title).addPreferredGap(LayoutStyle.RELATED, 5, Short.MAX_VALUE).add(1, 1, 1)).add(
GroupLayout.LEADING,
layout.createSequentialGroup().add(layout.createParallelGroup(GroupLayout.LEADING)
)