From ab9f0483dd9138db5381fae107d596c2564a8d2c Mon Sep 17 00:00:00 2001 From: dOkI Date: Thu, 28 Jan 2016 01:51:11 +0500 Subject: [PATCH] Ability to set font for JSyntaxTextArea --- bin/jmeter.properties | 3 +++ src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/bin/jmeter.properties b/bin/jmeter.properties index 3a3d1ab5002..a2a29e3e163 100644 --- a/bin/jmeter.properties +++ b/bin/jmeter.properties @@ -1076,6 +1076,9 @@ beanshell.server.file=../extras/startup.bsh #jsyntaxtextarea.codefolding=true # Set 0 to disable undo feature in JSyntaxTextArea #jsyntaxtextarea.maxundos=50 +#jsyntaxtextarea.font.family=Hack +#jsyntaxtextarea.font.size=14 + # Set this to false to disable the use of JSyntaxTextArea for the Console Logger panel #loggerpanel.usejsyntaxtext=true diff --git a/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java b/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java index 43658ae0616..93a7904c8bc 100644 --- a/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java +++ b/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java @@ -18,8 +18,11 @@ package org.apache.jmeter.gui.util; +import java.awt.Font; import java.util.Properties; +import javax.swing.UIManager; + import org.apache.jmeter.util.JMeterUtils; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rsyntaxtextarea.SyntaxConstants; @@ -39,6 +42,8 @@ public class JSyntaxTextArea extends RSyntaxTextArea { private static final boolean LINE_WRAP = JMeterUtils.getPropDefault("jsyntaxtextarea.linewrap", true); private static final boolean CODE_FOLDING = JMeterUtils.getPropDefault("jsyntaxtextarea.codefolding", true); private static final int MAX_UNDOS = JMeterUtils.getPropDefault("jsyntaxtextarea.maxundos", 50); + private static final String USER_FONT_FAMILY = JMeterUtils.getPropDefault("jsyntaxtextarea.font.family", JSyntaxTextArea.getDefaultFont().getName()); + private static final int USER_FONT_SIZE = JMeterUtils.getPropDefault("jsyntaxtextarea.font.size", JSyntaxTextArea.getDefaultFont().getSize()); @Deprecated public JSyntaxTextArea() { @@ -90,6 +95,7 @@ public JSyntaxTextArea(int rows, int cols, boolean disableUndo) { super.setLineWrap(LINE_WRAP); super.setWrapStyleWord(WRAP_STYLE_WORD); this.disableUndo = disableUndo; + setFont(new Font(USER_FONT_FAMILY, Font.PLAIN, USER_FONT_SIZE)); if(disableUndo) { // We need to do this to force recreation of undoManager which // will use the disableUndo otherwise it would always be false