Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Added scrolling to the game dialog area. Some more GUI resizing. Removed some unwanted borders of viewports.

Browse source
This commit is contained in:
LevelX2 2016-03-05 21:00:55 +01:00
parent d2ff6e3783
commit dd9431c8ea
10 changed files with 388 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
View file

@ -43,7 +43,6 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import mage.client.MageFrame;
import mage.client.chat.ChatPanelBasic;
import mage.client.components.MageTextArea;
import mage.client.dialog.MageDialog;
import mage.client.util.GUISizeHelper;
import mage.client.util.audio.AudioManager;
@ -94,10 +93,10 @@ public class FeedbackPanel extends javax.swing.JPanel {
public void changeGUISize() {
setGUISize();
helper.changeGUISize();
}
private void setGUISize() {
helper.changeGUISize();
}
public void getFeedback(FeedbackMode mode, String message, boolean special, Map<String, Serializable> options, int messageId) {
@ -112,7 +111,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
this.helper.setOriginalId(null); // reference to the feedback causing ability
String lblText = addAdditionalText(message, options);
this.helper.setTextArea(lblText);
this.lblMessage.setText(lblText);
//this.lblMessage.setText(lblText);
this.mode = mode;
switch (this.mode) {
case INFORM:
@ -239,14 +238,11 @@ public class FeedbackPanel extends javax.swing.JPanel {
this.btnLeft.setVisible(false);
this.btnRight.setVisible(false);
this.btnSpecial.setVisible(false);
this.lblMessage.setText("");
}
private void customInitComponents() {
btnRight = new javax.swing.JButton();
btnLeft = new javax.swing.JButton();
jScrollPane1 = new javax.swing.JScrollPane();
lblMessage = new MageTextArea();
btnSpecial = new javax.swing.JButton();
btnUndo = new javax.swing.JButton();
btnUndo.setVisible(true);
@ -269,13 +265,6 @@ public class FeedbackPanel extends javax.swing.JPanel {
}
});
jScrollPane1.setBorder(javax.swing.BorderFactory.createEtchedBorder());
jScrollPane1.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
lblMessage.setBorder(null);
jScrollPane1.setViewportView(lblMessage);
jScrollPane1.setBorder(null);
btnSpecial.setText("Special");
btnSpecial.addActionListener(new java.awt.event.ActionListener() {
@Override
@ -357,7 +346,5 @@ public class FeedbackPanel extends javax.swing.JPanel {
private javax.swing.JButton btnRight;
private javax.swing.JButton btnSpecial;
private javax.swing.JButton btnUndo;
private javax.swing.JScrollPane jScrollPane1;
private MageTextArea lblMessage;
private HelperPanel helper;
}