Skip to content

[pull] main from zaproxy:main #53

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

Merged
pull merged 2 commits into from
Sep 19, 2025
Merged

[pull] main from zaproxy:main #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a1e171
Improve support for FreeBSD (#8997)
alonsobsd Sep 19, 2025
9fed092
Implement DPI-aware divider sizing for WorkbenchPanel split panes (#9…
wyattfry Sep 19, 2025
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 zap/src/main/java/org/parosproxy/paros/Constant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1465,7 +1465,8 @@ public static boolean isWindows() {

// Determine Linux Operating System
// ZAP: Changed to final.
private static final Pattern patternLinux = Pattern.compile("linux", Pattern.CASE_INSENSITIVE);
private static final Pattern patternLinux =
Pattern.compile("linux|freebsd", Pattern.CASE_INSENSITIVE);

public static boolean isLinux() {
String os_name = System.getProperty("os.name");
Expand Down
5 changes: 3 additions & 2 deletions zap/src/main/java/org/parosproxy/paros/view/WorkbenchPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
import org.parosproxy.paros.Constant;
import org.parosproxy.paros.extension.AbstractPanel;
import org.parosproxy.paros.extension.option.OptionsParamView;
import org.zaproxy.zap.utils.DisplayUtils;
import org.zaproxy.zap.view.ComponentMaximiser;
import org.zaproxy.zap.view.ComponentMaximiserMouseListener;
import org.zaproxy.zap.view.TabbedPanel2;
Expand Down Expand Up @@ -648,7 +649,7 @@ private JSplitPane createStatusPanelsSplit() {
splitVert.addPropertyChangeListener(
JSplitPane.DIVIDER_LOCATION_PROPERTY, new DividerResizedListener(DIVIDER_VERTICAL));

splitVert.setDividerSize(3);
splitVert.setDividerSize(DisplayUtils.getScaledSize(8));
splitVert.setOrientation(JSplitPane.VERTICAL_SPLIT);
splitVert.setResizeWeight(0.5D);

Expand Down Expand Up @@ -1357,7 +1358,7 @@ private void splitResponsePanelWithWorkTabbedPanel(int orientation) {

private static JSplitPane createSplitPane(int orientation) {
JSplitPane splitPane = new JSplitPane(orientation);
splitPane.setDividerSize(3);
splitPane.setDividerSize(DisplayUtils.getScaledSize(6));
splitPane.setResizeWeight(0.5D);
splitPane.setContinuousLayout(false);
splitPane.setDoubleBuffered(true);
Expand Down
Loading