Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-07 14:30:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

PopupFactory: fixed NPE on Windows 10 when owner is null (issue #952)

Browse Source
This commit is contained in:
Karl Tauber
2025-01-09 12:26:57 +01:00
parent 0ad3180b10
commit d17fffb82a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -18,6 +18,7 @@ FlatLaf Change Log
- FileChooser: Improved performance when navigating to large directories with - FileChooser: Improved performance when navigating to large directories with
thousands of files. (issue #953) thousands of files. (issue #953)
- PopupFactory: Fixed NPE on Windows 10 when `owner` is `null`. (issue #952)
## 3.5.4 ## 3.5.4

4
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupFactory.java
View File

@@ -138,7 +138,7 @@ public class FlatPopupFactory
// create drop shadow popup // create drop shadow popup
Popup popupForScreenOfOwner = getPopupForScreenOfOwner( owner, contents, x, y, forceHeavyWeight ); Popup popupForScreenOfOwner = getPopupForScreenOfOwner( owner, contents, x, y, forceHeavyWeight );
GraphicsConfiguration gc = owner.getGraphicsConfiguration(); GraphicsConfiguration gc = (owner != null) ? owner.getGraphicsConfiguration() : null;
return (gc != null && gc.isTranslucencyCapable()) return (gc != null && gc.isTranslucencyCapable())
? new DropShadowPopup( popupForScreenOfOwner, owner, contents ) ? new DropShadowPopup( popupForScreenOfOwner, owner, contents )
: new NonFlashingPopup( popupForScreenOfOwner, owner, contents ); : new NonFlashingPopup( popupForScreenOfOwner, owner, contents );
@@ -306,7 +306,7 @@ public class FlatPopupFactory
break; break;
} }
} }
if( gc == null ) if( gc == null && owner != null )
gc = owner.getGraphicsConfiguration(); gc = owner.getGraphicsConfiguration();
if( gc == null ) if( gc == null )
return null; return null;