Author: echatellier Date: 2011-11-17 15:22:11 +0100 (Thu, 17 Nov 2011) New Revision: 899 Url: http://forge.codelutin.com/repositories/revision/coser/899 Log: Fix font size modification bug on windows Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java 2011-11-17 14:21:48 UTC (rev 898) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java 2011-11-17 14:22:11 UTC (rev 899) @@ -24,8 +24,6 @@ */ package fr.ifremer.coser; -import java.awt.Frame; -import java.awt.Window; import java.io.File; import javax.swing.SwingUtilities; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2011-11-17 14:21:48 UTC (rev 898) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2011-11-17 14:22:11 UTC (rev 899) @@ -28,11 +28,7 @@ import static org.nuiton.i18n.I18n._; import java.awt.Font; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; import java.util.Enumeration; -import java.util.List; import javax.swing.UIManager; import javax.swing.plaf.FontUIResource; @@ -191,12 +187,13 @@ Enumeration<Object> keys = UIManager.getDefaults().keys(); while (keys.hasMoreElements()) { Object key = keys.nextElement(); - if (key.toString().contains("Font") || key.toString().contains(".font")) { + // Application.useSystemFontSettings exists on windows + if (key.toString().endsWith("Font") || key.toString().endsWith(".font")) { Font font = (Font)UIManager.getFont(key); - font = font.deriveFont((float)newIncrease); if (log.isDebugEnabled()) { - log.debug("Update " + key + " to size " + font.getSize()); + log.debug("Update " + key + " to size " + newIncrease); } + font = font.deriveFont((float)newIncrease); UIManager.put(key, new FontUIResource(font)); } }