in progress

[jalview.git] / forester / java / src / org / forester / archaeopteryx / TreeFontSet.java

diff --git a/forester/java/src/org/forester/archaeopteryx/TreeFontSet.java b/forester/java/src/org/forester/archaeopteryx/TreeFontSet.java
index 66020cc..22d3950 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/TreeFontSet.java
+++ b/forester/java/src/org/forester/archaeopteryx/TreeFontSet.java
@@ -8,7 +8,7 @@
 // and Howard Hughes Medical Institute
 // Copyright (C) 2003-2007 Ethalinda K.S. Cannon
 // All rights reserved
-// 
+//
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
@@ -18,13 +18,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // Lesser General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 //
 // Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
 
 package org.forester.archaeopteryx;
 
@@ -48,6 +48,10 @@ public final class TreeFontSet {
     private Font                _small_italic_font;
     private Font                _large_italic_font;
     private Font                _base_font;
+    private Font                _small_font_system;
+    private Font                _large_font_system;
+    private Font                _small_italic_font_system;
+    private Font                _large_italic_font_system;
     // Handy holders for font metrics
     public FontMetrics          _fm_small;
     FontMetrics                 _fm_large;
@@ -73,26 +77,48 @@ public final class TreeFontSet {
             setupFontMetrics();
         }
     }
+    
+    void reset() {
+        _large_font_system = _large_font;
+        
+    }
 
     Font getBaseFont() {
         return _base_font;
     }
-
+    
+  
     Font getLargeFont() {
-        return _large_font;
+        return getLargeFontSystem();
+    }
+    
+    private Font getLargeFontSystem() {
+        return _large_font_system;
     }
 
     Font getLargeItalicFont() {
         return _large_italic_font;
     }
+    
+    Font getLargeItalicFontSystem() {
+        return _large_italic_font_system;
+    }
 
     public Font getSmallFont() {
         return _small_font;
     }
+    
+    public Font getSmallFontSystem() {
+        return _small_font_system;
+    }
 
     Font getSmallItalicFont() {
         return _small_italic_font;
     }
+    
+    Font getSmallItalicFontSystem() {
+        return _small_italic_font_system;
+    }
 
     void increaseFontSize() {
         _small_font = _small_font.deriveFont( _small_font.getSize() + FONT_SIZE_CHANGE_STEP );
@@ -112,6 +138,15 @@ public final class TreeFontSet {
         _large_font = new Font( getBaseFont().getFontName(), getBaseFont().getStyle(), getBaseFont().getSize() );
         _small_italic_font = new Font( getBaseFont().getFontName(), italic, small_size );
         _large_italic_font = new Font( getBaseFont().getFontName(), italic, getBaseFont().getSize() );
+        _small_font_system = new Font( getBaseFont().getFontName(), getBaseFont().getStyle(), small_size );
+        _large_font_system = new Font( getBaseFont().getFontName(), getBaseFont().getStyle(), getBaseFont().getSize() );
+        _small_italic_font_system = new Font( getBaseFont().getFontName(), italic, small_size );
+        _large_italic_font_system = new Font( getBaseFont().getFontName(), italic, getBaseFont().getSize() );
+        
+        
+        
+        
+        
         setupFontMetrics();
     }