diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLinuxLibrary.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLinuxLibrary.java index b5cfa333..8a884d4e 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLinuxLibrary.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeLinuxLibrary.java @@ -23,6 +23,7 @@ import java.awt.event.MouseEvent; import java.awt.geom.AffineTransform; import javax.swing.JDialog; import javax.swing.JFrame; +import com.formdev.flatlaf.util.SystemInfo; /** * Native methods for Linux. @@ -35,7 +36,7 @@ import javax.swing.JFrame; class FlatNativeLinuxLibrary { static boolean isLoaded() { - return FlatNativeLibrary.isLoaded(); + return SystemInfo.isLinux && FlatNativeLibrary.isLoaded(); } // direction for _NET_WM_MOVERESIZE message diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowsLibrary.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowsLibrary.java index 9df5ae23..17ffa839 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowsLibrary.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowsLibrary.java @@ -17,6 +17,7 @@ package com.formdev.flatlaf.ui; import java.awt.Window; +import com.formdev.flatlaf.util.SystemInfo; /** * Native methods for Windows. @@ -31,7 +32,7 @@ public class FlatNativeWindowsLibrary private static long osBuildNumber = Long.MIN_VALUE; public static boolean isLoaded() { - return FlatNativeLibrary.isLoaded(); + return SystemInfo.isWindows && FlatNativeLibrary.isLoaded(); } /** diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java index 6be6e98f..c96e804d 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java @@ -126,9 +126,9 @@ public class SystemInfo // For older Java versions, use native library to get OS build number. boolean isWin_11_orLater = false; try { - isWin_11_orLater = (isWindows_10_orLater && - (scanVersion( StringUtils.removeLeading( osName, "windows " ) ) >= toVersion( 11, 0, 0, 0 )) || - (FlatNativeWindowsLibrary.isLoaded() && FlatNativeWindowsLibrary.getOSBuildNumber() >= 22000)); + isWin_11_orLater = isWindows_10_orLater && + (scanVersion( StringUtils.removeLeading( osName, "windows " ) ) >= toVersion( 11, 0, 0, 0 ) || + (FlatNativeWindowsLibrary.isLoaded() && FlatNativeWindowsLibrary.getOSBuildNumber() >= 22000)); } catch( Throwable ex ) { // catch to avoid that application can not start if native library is not up-to-date LoggingFacade.INSTANCE.logSevere( null, ex );