From 0a9ecd66a9c26591309a0489e0dd483c665b1fc7 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Mon, 9 Dec 2024 00:43:44 +0100 Subject: [PATCH] Linux: fixed NPE when using FlatLaf window decorations and switching theme (issue #933; regression in 3.5.3) caused by fix for #907; commit d471f08b156aef5c2a219d3842465419f516e8d0 --- CHANGELOG.md | 2 ++ .../main/java/com/formdev/flatlaf/ui/FlatWindowResizer.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9ee6322..a5c17b22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ FlatLaf Change Log - HTML: Fixed NPE when using HTML text on a component with `null` font. (issue #930; PR #931; regression in 3.5) +- Linux: Fixed NPE when using FlatLaf window decorations and switching theme. + (issue #933; regression in 3.5.3) ## 3.5.3 diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowResizer.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowResizer.java index c466ecf8..a7a77b08 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowResizer.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowResizer.java @@ -272,7 +272,8 @@ public abstract class FlatWindowResizer public void doLayout() { super.doLayout(); - centerComp.setBounds( 0, 0, resizeComp.getWidth(), resizeComp.getHeight() ); + if( centerComp != null && centerComp.isVisible() ) + centerComp.setBounds( 0, 0, resizeComp.getWidth(), resizeComp.getHeight() ); } @Override @@ -376,6 +377,7 @@ public abstract class FlatWindowResizer @Override protected void beginResizing( int resizeDir ) { + centerComp.setBounds( 0, 0, resizeComp.getWidth(), resizeComp.getHeight() ); centerComp.setCursor( getPredefinedCursor( resizeDir ) ); centerComp.setVisible( true ); }