release 3.5.4

Linux: fixed NPE when using FlatLaf window decorations and switching theme (issue #933 ; regression in 3.5.3)
caused by fix for #907; commit d471f08b15
2026-02-15 00:07:12 -06:00 · 2024-12-09 00:44:57 +01:00 · 2024-12-09 00:43:44 +01:00 · 2024-12-08 23:01:00 +01:00
5 changed files with 28 additions and 5 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
 FlatLaf Change Log
 ==================

+## 3.5.4
+
+#### Fixed bugs
+
+- 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

 #### Fixed bugs
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatHTML.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatHTML.java
@@ -17,6 +17,7 @@
 package com.formdev.flatlaf.ui;

 import java.awt.Color;
+import java.awt.Font;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Arrays;
@@ -74,9 +75,9 @@ public class FlatHTML
 		for( int i = 1; i <= 7; i++ )
 			System.out.println( i+": "+ styleSheet.getPointSize( i ) );
 debug*/
-		int fontBaseSize = c.getFont().getSize();
+		Font font = c.getFont();
 		if( styleSheet.getPointSize( 7 ) != 36f ||
-			styleSheet.getPointSize( 4 ) == fontBaseSize )
+			font == null || styleSheet.getPointSize( 4 ) == font.getSize() )
 		  return;

 		// check whether view uses "absolute-size" keywords (e.g. "x-large") for font-size
@@ -97,7 +98,7 @@ debug*/
 			return;

 		// BASE_SIZE rule is parsed in javax.swing.text.html.StyleSheet.addRule()
-		String style = "<style>BASE_SIZE " + c.getFont().getSize() + "</style>";
+		String style = "<style>BASE_SIZE " + font.getSize() + "</style>";
 		String openTag = "";
 		String closeTag = "";

--- 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 );
 		}
--- a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatHTML.java
+++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatHTML.java
@@ -16,6 +16,7 @@

 package com.formdev.flatlaf.ui;

+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.Locale;
 import javax.swing.JComponent;
@@ -73,6 +74,15 @@ public class TestFlatHTML
 		testHtmlBaseSize( "<html>${BASE_SIZE}<style type='text/css'>body { color: #f00; }</style><h1>header1</h1>" + body + "</html>", "header1\n" + bodyPlain );
 	}

+	@Test
+	void htmlOnComponentWithNullFont() {
+		assertDoesNotThrow( () -> {
+			JLabel label = new JLabel();
+			label.setFont( null );
+			label.setText( "<html>foo<br>bar</html>" );
+		} );
+	}
+
 	private void testHtmlBaseSize( String html, String expectedPlain ) {
 		testHtmlBaseSizeImpl( html, expectedPlain );
 		testHtmlBaseSizeImpl( html.toUpperCase( Locale.ENGLISH ), expectedPlain.toUpperCase( Locale.ENGLISH ) );
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 #

-flatlaf.releaseVersion     = 3.5.3
+flatlaf.releaseVersion     = 3.5.4
 flatlaf.developmentVersion = 3.6-SNAPSHOT

 org.gradle.parallel = true
Author	SHA1	Message	Date
Karl Tauber	3ba9fc6c1c	release 3.5.4	2024-12-09 00:44:57 +01:00
Karl Tauber	0a9ecd66a9	Linux: fixed NPE when using FlatLaf window decorations and switching theme (issue #933 ; regression in 3.5.3) caused by fix for #907; commit `d471f08b15`	2024-12-09 00:43:44 +01:00
Karl Tauber	6991d6729e	Merge PR #931 : Fixing NPE when using HTML text on a component with null font (cherry picked from commit `41332de275`)	2024-12-08 23:01:00 +01:00