Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scripts: Use workPanels font in output panel #4886

Closed
wants to merge 1 commit into from
Closed

scripts: Use workPanels font in output panel #4886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion addOns/scripts/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions addOns/scripts/src/main/java/org/zaproxy/zap/extension/scripts/ConsolePanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are removing here we should remove from scroll pane as well.

panelToolbar.setName("ParamsToolbar");

panelToolbar.add(this.getRunButton(), LayoutHelper.getGBC(0, 0, 1, 0.0D));
Expand Down
5 changes: 3 additions & 2 deletions addOns/scripts/src/main/java/org/zaproxy/zap/extension/scripts/OutputPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}
Expand All @@ -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);
}
Expand Down