From e1663262dbbcce837168e7690f2c022460301e5c Mon Sep 17 00:00:00 2001 From: kingthorin Date: Mon, 11 Sep 2023 06:25:11 -0400 Subject: [PATCH] scripts: Use workPanels font in output panel - CHANGELOG > Add change note. - ConsolePanel > Don't set font. - OutputPanel > Use workPanels font. Signed-off-by: kingthorin --- addOns/scripts/CHANGELOG.md | 3 ++- .../java/org/zaproxy/zap/extension/scripts/ConsolePanel.java | 2 -- .../java/org/zaproxy/zap/extension/scripts/OutputPanel.java | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addOns/scripts/CHANGELOG.md b/addOns/scripts/CHANGELOG.md index 8a21e72f76e..9c5d056d94d 100644 --- a/addOns/scripts/CHANGELOG.md +++ b/addOns/scripts/CHANGELOG.md @@ -4,7 +4,8 @@ All notable changes to this add-on will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased - +### Changed +- The Scripts output panel will now use the work panel font defined in Display settings (Issue 8065). ## [40] - 2023-09-11 ### Changed diff --git a/addOns/scripts/src/main/java/org/zaproxy/zap/extension/scripts/ConsolePanel.java b/addOns/scripts/src/main/java/org/zaproxy/zap/extension/scripts/ConsolePanel.java index 956cb6210e5..99237e0a2bc 100644 --- a/addOns/scripts/src/main/java/org/zaproxy/zap/extension/scripts/ConsolePanel.java +++ b/addOns/scripts/src/main/java/org/zaproxy/zap/extension/scripts/ConsolePanel.java @@ -45,7 +45,6 @@ import org.zaproxy.zap.ZAP; import org.zaproxy.zap.extension.script.ScriptWrapper; import org.zaproxy.zap.utils.DisplayUtils; -import org.zaproxy.zap.utils.FontUtils; import org.zaproxy.zap.view.LayoutHelper; import org.zaproxy.zap.view.ZapToggleButton; @@ -216,7 +215,6 @@ private javax.swing.JToolBar getPanelToolbar() { panelToolbar.setFloatable(false); panelToolbar.setRollover(true); panelToolbar.setPreferredSize(new java.awt.Dimension(800, 30)); - panelToolbar.setFont(FontUtils.getFont("Dialog")); panelToolbar.setName("ParamsToolbar"); panelToolbar.add(this.getRunButton(), LayoutHelper.getGBC(0, 0, 1, 0.0D)); diff --git a/addOns/scripts/src/main/java/org/zaproxy/zap/extension/scripts/OutputPanel.java b/addOns/scripts/src/main/java/org/zaproxy/zap/extension/scripts/OutputPanel.java index 60b8103afa2..73789a46b2a 100644 --- a/addOns/scripts/src/main/java/org/zaproxy/zap/extension/scripts/OutputPanel.java +++ b/addOns/scripts/src/main/java/org/zaproxy/zap/extension/scripts/OutputPanel.java @@ -34,6 +34,7 @@ import org.parosproxy.paros.extension.AbstractPanel; import org.zaproxy.zap.utils.DisplayUtils; import org.zaproxy.zap.utils.FontUtils; +import org.zaproxy.zap.utils.FontUtils.FontType; import org.zaproxy.zap.utils.ZapTextArea; import org.zaproxy.zap.view.ZapToggleButton; @@ -169,7 +170,7 @@ private JScrollPane getJScrollPane() { jScrollPane.setName("ConsoleScrollPane"); jScrollPane.setHorizontalScrollBarPolicy( javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - jScrollPane.setFont(FontUtils.getFont("Dialog")); + jScrollPane.setFont(FontUtils.getFont(FontType.workPanels)); } return jScrollPane; } @@ -184,7 +185,7 @@ private ZapTextArea getTxtOutput() { txtOutput = new ZapTextArea(); txtOutput.setEditable(false); txtOutput.setLineWrap(true); - txtOutput.setFont(FontUtils.getFont("Dialog")); + txtOutput.setFont(FontUtils.getFont(FontType.workPanels)); txtOutput.setName(""); txtOutput.setComponentPopupMenu(ZapPopupMenu.INSTANCE); }