You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2022/12/20 16:44:54 UTC

[netbeans] branch master updated: FlatLaf: fix font of window title when using `--fontsize` argument (on Windows) (issue #5041)

This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new ceacfe52dc FlatLaf: fix font of window title when using `--fontsize` argument (on Windows) (issue #5041)
ceacfe52dc is described below

commit ceacfe52dc09478b5d762157afa15ec2611b2403
Author: Karl Tauber <ka...@jformdesigner.com>
AuthorDate: Sat Dec 3 17:03:22 2022 +0100

    FlatLaf: fix font of window title when using `--fontsize` argument (on Windows) (issue #5041)
---
 platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/AllLFCustoms.java | 2 +-
 platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/AllLFCustoms.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/AllLFCustoms.java
index c09d9f69ee..e35adc40a3 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/AllLFCustoms.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/AllLFCustoms.java
@@ -112,7 +112,7 @@ final class AllLFCustoms extends LFCustoms {
         
         Map<Font, Font> fontTranslation = new HashMap<Font, Font>(5);
         
-        if( "Nimbus".equals( UIManager.getLookAndFeel().getID() ) ) { //NOI18N
+        if( UIManager.getFont("defaultFont") != null ) { //NOI18N
             switchFont("defaultFont", fontTranslation, uiFontSize, nbDialogPlain); // NOI18N
         }
         switchFont("controlFont", fontTranslation, uiFontSize, nbDialogPlain); // NOI18N
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java
index 3b49194721..2d7c828b48 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java
@@ -537,7 +537,7 @@ public final class Startup {
           // Modify default font size to the font size passed as a command-line parameter
             if(uiFontSize>0) {
                 Integer customFontSize = new Integer (uiFontSize);
-                UIManager.put ("customFontSize", customFontSize);
+                UIManager.put (LFCustoms.CUSTOM_FONT_SIZE, customFontSize);
             }
             Startup.uiClass = uiClass;
             Startup.themeURL = themeURL;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists