Merge PR #754: Fixing NPE when showing a popup without an invoker on Windows 10

This commit is contained in:
Karl Tauber
2023-10-21 23:52:02 +02:00
2 changed files with 13 additions and 2 deletions

View File

@@ -1,12 +1,20 @@
FlatLaf Change Log FlatLaf Change Log
================== ==================
## 3.2.5
#### Fixed bugs
- Popup: Fixed NPE if popup invoker is `null` on Windows 10. (issue #753;
regression in 3.2.1 in fix for #626)
## 3.2.4 ## 3.2.4
#### Fixed bugs #### Fixed bugs
- Popup: Fixed potential NPE in (unusual) case that the popup invoker is `null` - Popup: Fixed NPE if popup invoker is `null` on Linux with Wayland and Java 21.
(only on Linux with Wayland and Java 21; regression in 3.2.3). (issue #752) (issue #752; regression in 3.2.3)
## 3.2.3 ## 3.2.3

View File

@@ -397,6 +397,9 @@ public class FlatPopupFactory
} }
private static boolean overlapsHeavyWeightComponent( Component owner, Component contents, int x, int y ) { private static boolean overlapsHeavyWeightComponent( Component owner, Component contents, int x, int y ) {
if( owner == null )
return false;
Window window = SwingUtilities.getWindowAncestor( owner ); Window window = SwingUtilities.getWindowAncestor( owner );
if( window == null ) if( window == null )
return false; return false;