From b6a38e3f23a561a99e82cf18655294987932026d Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Fri, 14 Jun 2019 18:01:14 +0100 Subject: [PATCH] revert to default lnf if the desired one fails --- gui/griffon-app/lifecycle/Initialize.groovy | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gui/griffon-app/lifecycle/Initialize.groovy b/gui/griffon-app/lifecycle/Initialize.groovy index dc53c924..0c55a0e7 100644 --- a/gui/griffon-app/lifecycle/Initialize.groovy +++ b/gui/griffon-app/lifecycle/Initialize.groovy @@ -18,6 +18,7 @@ import static griffon.util.GriffonApplicationUtils.isMacOSX import static groovy.swing.SwingBuilder.lookAndFeel import java.awt.Font +import java.util.logging.Level @Log class Initialize extends AbstractLifecycleHandler { @@ -50,7 +51,12 @@ class Initialize extends AbstractLifecycleHandler { uiSettings = new UISettings(props) log.info("settting user-specified lnf $uiSettings.lnf") - lookAndFeel(uiSettings.lnf) + try { + lookAndFeel(uiSettings.lnf) + } catch (Throwable bad) { + log.log(Level.WARNING,"couldn't set desired look and feeel, switching to defaults", bad) + uiSettings.lnf = lookAndFeel("system","gtk","metal").getID() + } if (uiSettings.font != null) { log.info("setting user-specified font $uiSettings.font") @@ -78,7 +84,7 @@ class Initialize extends AbstractLifecycleHandler { } } else { LookAndFeel chosen = lookAndFeel('system', 'gtk') - uiSettings.lnf = chosen.name + uiSettings.lnf = chosen.getID() log.info("ended up applying $chosen.name") } }