From d13ddeb9446dcbf678042b3f18126317a02975ee Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Tue, 30 Mar 2021 11:00:27 +0200 Subject: [PATCH] use larger font when running on WinPE (issue #279) --- .../main/java/com/formdev/flatlaf/FlatLaf.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java index ad51fad8..41db5a9b 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java @@ -443,12 +443,17 @@ public abstract class FlatLaf FontUIResource uiFont = null; if( SystemInfo.isWindows ) { - // on WinPE use "win.defaultGUI.font", which is usually Tahoma, - // because Segoe UI font is not available on WinPE - Font winFont = (Font) Toolkit.getDefaultToolkit().getDesktopProperty( - SystemInfo.isWinPE ? "win.defaultGUI.font" : "win.messagebox.font" ); - if( winFont != null ) - uiFont = createCompositeFont( winFont.getFamily(), winFont.getStyle(), winFont.getSize() ); + Font winFont = (Font) Toolkit.getDefaultToolkit().getDesktopProperty( "win.messagebox.font" ); + if( winFont != null ) { + if( SystemInfo.isWinPE ) { + // on WinPE use "win.defaultGUI.font", which is usually Tahoma, + // because Segoe UI font is not available on WinPE + Font winPEFont = (Font) Toolkit.getDefaultToolkit().getDesktopProperty( "win.defaultGUI.font" ); + if( winPEFont != null ) + uiFont = createCompositeFont( winPEFont.getFamily(), winPEFont.getStyle(), winFont.getSize() ); + } else + uiFont = createCompositeFont( winFont.getFamily(), winFont.getStyle(), winFont.getSize() ); + } } else if( SystemInfo.isMacOS ) { String fontName;