From 03d00a22d777299d18040198bc0bd417ce3bf2ac Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Mon, 14 Sep 2020 13:32:25 +0100 Subject: [PATCH] try native lnf on all platforms with metal last --- gui/griffon-app/lifecycle/Initialize.groovy | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gui/griffon-app/lifecycle/Initialize.groovy b/gui/griffon-app/lifecycle/Initialize.groovy index e9c5b60c..347704ca 100644 --- a/gui/griffon-app/lifecycle/Initialize.groovy +++ b/gui/griffon-app/lifecycle/Initialize.groovy @@ -158,18 +158,11 @@ class Initialize extends AbstractLifecycleHandler { Properties props = new Properties() uiSettings = new UISettings(props) log.info "will try default lnfs" - LookAndFeel chosen - if (isMacOSX()) { - uiSettings.lnf = "metal" - chosen = lookAndFeel("metal") - } else { - chosen = lookAndFeel('system', 'gtk') - if (chosen == null) - chosen = lookAndFeel('metal') - uiSettings.lnf = chosen.getID() - log.info("ended up applying $chosen.name") - } + LookAndFeel chosen = lookAndFeel('system', 'gtk', 'metal') + uiSettings.lnf = chosen.getID() + log.info("ended up applying $chosen.name") + FontUIResource defaultFont = chosen.getDefaults().getFont("Label.font") uiSettings.font = defaultFont.getName() uiSettings.fontSize = defaultFont.getSize()