Skip to content

[pull] main from zaproxy:main #135

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
Mar 4, 2026
+9 −5
Merged

[pull] main from zaproxy:main #135

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5888d4a
Address UI trees not updating fully on theme switch
kingthorin Mar 4, 2026
6603ca5
Merge pull request #9271 from kingthorin/laf-fix
psiinon Mar 4, 2026
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
14 changes: 9 additions & 5 deletions zap/src/main/java/org/parosproxy/paros/extension/option/OptionsParamView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,11 +669,10 @@ public void setLookAndFeelInfo(LookAndFeelInfo lookAndFeelInfo) {
e -> {
try {
UIManager.setLookAndFeel(lookAndFeelInfo.getClassName());
Arrays.asList(Window.getWindows()).stream()
.forEach(SwingUtilities::updateComponentTreeUI);
View.getSingleton()
.getPopupList()
.forEach(SwingUtilities::updateComponentTreeUI);
updateUiComponentTree();
// A second pass is needed to ensure all components;
// trees in particular, are updated.
updateUiComponentTree();
} catch (Exception e2) {
LOGGER.warn(
"Failed to set the look and feel: {}",
Expand All @@ -690,6 +689,11 @@ public void setLookAndFeelInfo(LookAndFeelInfo lookAndFeelInfo) {
}
}

private static void updateUiComponentTree() {
Arrays.stream(Window.getWindows()).forEach(SwingUtilities::updateComponentTreeUI);
View.getSingleton().getPopupList().forEach(SwingUtilities::updateComponentTreeUI);
}

public boolean isScaleImages() {
return scaleImages;
}
Expand Down
Loading