Merge remote-tracking branch 'origin/5.0.x'

NetLogo · Apr 3, 2013 · 121f0db · 121f0db
2 parents 5faea63 + 56b003a
commit 121f0db
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/org/nlogo/window/Zoomer.java b/src/main/org/nlogo/window/Zoomer.java
@@ -141,9 +141,9 @@ private void storeComponentFont(java.awt.Component component, boolean recursive,
     // want to remember what the font size at the 100% zoom level is, because
     // font sizes are so small that rounding error will mess us up unless we
     // always scale from the normal, unzoomed size
-    if (!(component instanceof ViewWidgetInterface) ||
-        !newWidget ||
-        loadingWidget) {
+    if ((!(component instanceof ViewWidgetInterface) ||
+         !newWidget ||
+         loadingWidget) && fonts.get(component) == null) {
       fonts.put(component, component.getFont());
       fontZooms.put(component, Double.valueOf(oldZoom));
     }