angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-12 23:07:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linux: fixed NPE when using java.awt.TrayIcon (issue #405)

Browse Source
This commit is contained in:
Karl Tauber
2021-11-03 23:37:37 +01:00
parent 475781db91
commit 16a769ea61
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -56,6 +56,7 @@ FlatLaf Change Log
`JTable.surrendersFocusOnKeystroke` is `true`) and `JTable.surrendersFocusOnKeystroke` is `true`) and
`TextComponent.selectAllOnFocusPolicy` is `once` (the default) or `always`. `TextComponent.selectAllOnFocusPolicy` is `once` (the default) or `always`.
(issue #395) (issue #395)
- Linux: Fixed NPE when using `java.awt.TrayIcon`. (issue #405)
## 1.6.1 ## 1.6.1

6
flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
View File

@@ -269,6 +269,12 @@ public abstract class FlatLaf
} }
}; };
Toolkit toolkit = Toolkit.getDefaultToolkit(); Toolkit toolkit = Toolkit.getDefaultToolkit();
// make sure that AWT desktop properties are initialized (on Linux)
// before invoking toolkit.addPropertyChangeListener()
// https://github.com/JFormDesigner/FlatLaf/issues/405#issuecomment-960242342
toolkit.getDesktopProperty( "dummy" );
toolkit.addPropertyChangeListener( desktopPropertyName, desktopPropertyListener ); toolkit.addPropertyChangeListener( desktopPropertyName, desktopPropertyListener );
if( desktopPropertyName2 != null ) if( desktopPropertyName2 != null )
toolkit.addPropertyChangeListener( desktopPropertyName2, desktopPropertyListener ); toolkit.addPropertyChangeListener( desktopPropertyName2, desktopPropertyListener );