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

* Some changes to chat handling to fix unintended empty line.

Browse source
This commit is contained in:
LevelX2 2014-10-12 18:56:37 +02:00
parent 63cd131855
commit 499b548a14
2 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
View file

@ -230,9 +230,10 @@ public class ChatPanel extends javax.swing.JPanel {
if (username != null && !username.isEmpty()) {
text.append(getColoredText(userColor, username + userSeparator));
}
text.append(getColoredText(textColor, ManaSymbols.replaceSymbolsWithHTML(message, ManaSymbols.Type.PAY) + "<br/>"));
text.append(getColoredText(textColor, ManaSymbols.replaceSymbolsWithHTML(message, ManaSymbols.Type.PAY)));
this.txtConversation.append(text.toString());
this.txtConversation.requestFocusInWindow();
this.txtMessage.requestFocusInWindow();
}
private String getColoredText(String color, String text) {
@ -279,8 +280,9 @@ public class ChatPanel extends javax.swing.JPanel {
public void useExtendedView(VIEW_MODE extendedViewMode) {
this.extendedViewMode = extendedViewMode;
this.txtConversation.setExtBackgroundColor(new Color(0, 0, 0, 100));
this.txtConversation.setBackground(new Color(0, 0, 0, 0));
this.txtConversation.setForeground(new Color(255, 255, 255));
// this.txtConversation.setBackground(new Color(0, 0, 0, 0));
// this.txtConversation.setForeground(new Color(255, 255, 255));
this.txtConversation.setSelectionColor(Color.LIGHT_GRAY);
this.jScrollPaneTxt.setOpaque(false);
this.jScrollPaneTxt.getViewport().setOpaque(false);
}

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

@ -1,7 +1,16 @@
package mage.client.components;
import javax.swing.*;
import java.awt.*;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Graphics;
import static javafx.scene.paint.Color.color;
import javax.swing.JEditorPane;
import javax.swing.JPanel;
import javax.swing.JTextPane;
import javax.swing.text.AttributeSet;
import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants;
import javax.swing.text.StyleContext;
import javax.swing.text.html.HTMLDocument;
import javax.swing.text.html.HTMLEditorKit;
@ -10,14 +19,14 @@ import javax.swing.text.html.HTMLEditorKit;
*
* @author nantuko
*/
public class ColorPane extends JTextPane {
public class ColorPane extends JEditorPane {
HTMLEditorKit kit = new HTMLEditorKit();
HTMLDocument doc = new HTMLDocument();
HTMLDocument doc = new HTMLDocument();
public ColorPane() {
this.setEditorKit(kit);
this.setDocument(doc);
this.setDocument(doc);
}
/**
* This method solves the known issue with Nimbus LAF background transparency and background color.
@ -36,26 +45,14 @@ public class ColorPane extends JTextPane {
super.setText(string); //To change body of generated methods, choose Tools | Templates.
}
public void append(String s) {
public void append(String text) {
try {
setEditable(true);
kit.insertHTML(doc, doc.getLength(), s, 0, 0, null);
kit.insertHTML(doc, doc.getLength(), text, 0, 0, null);
setEditable(false);
int len = getDocument().getLength();
setCaretPosition(len);
setEditable(false);
//
//
// StyleContext sc = StyleContext.getDefaultStyleContext();
// AttributeSet aset = sc.addAttribute(SimpleAttributeSet.EMPTY, StyleConstants.Foreground, color);
//
// int len = getDocument().getLength();
//
// setCaretPosition(len);
// setCharacterAttributes(aset, false);
// replaceSelection(s);
//
//
} catch (Exception e) {
e.printStackTrace();
}