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

Merge PR #709: x86: Narrow version range for not using system icons

Browse Source
This commit is contained in:
Karl Tauber
2023-08-07 19:55:11 +02:00
parent 4b4990635d d30fe66cac
commit b9737ca4f1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -61,6 +61,9 @@ FlatLaf Change Log
listener on that formatted text field. (issue #698) listener on that formatted text field. (issue #698)
- PopupMenu: Make sure that popup menu does not overlap any operating system - PopupMenu: Make sure that popup menu does not overlap any operating system
task bar. (issue #701) task bar. (issue #701)
- FileChooser: Use system icons on Windows with Java 17.0.3 (and later) 32-bit.
Only Java 7 - 17.0.2 32-bit do not use system icons because of a bug in Java
32-bit that crashes the application. (PR #709)
- FileChooser: Fixed crash on Windows with Java 17 to 17.0.2 32-bit. Java 17 - FileChooser: Fixed crash on Windows with Java 17 to 17.0.2 32-bit. Java 17
64-bit is not affected. (regression since FlatLaf 2.3; PR #522, see also issue 64-bit is not affected. (regression since FlatLaf 2.3; PR #522, see also issue
#403) #403)

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

@@ -349,10 +349,10 @@ public class FlatFileChooserUI
private static boolean doNotUseSystemIcons() { private static boolean doNotUseSystemIcons() {
// Java 17 32bit craches on Windows when using system icons // Java 17 32bit craches on Windows when using system icons
// fixed in Java 18+ (see https://bugs.openjdk.java.net/browse/JDK-8277299) // fixed in Java 18+, fix backported in Java 17.0.3+ (see https://bugs.openjdk.java.net/browse/JDK-8277299)
return SystemInfo.isWindows && return SystemInfo.isWindows &&
SystemInfo.isX86 && SystemInfo.isX86 &&
(SystemInfo.isJava_17_orLater && !SystemInfo.isJava_18_orLater); (SystemInfo.isJava_17_orLater && SystemInfo.javaVersion < SystemInfo.toVersion( 17, 0, 3, 0 ));
} }
//---- class FlatFileView ------------------------------------------------- //---- class FlatFileView -------------------------------------------------