JAL-2872 Undid inference disabling (done in Jalview instead)

[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 c278f1c..40d945d 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/TreeFontSet.java
+++ b/forester/java/src/org/forester/archaeopteryx/TreeFontSet.java
@@ -39,7 +39,7 @@ public final class TreeFontSet {
     static final int            BOLD_AND_ITALIC           = Font.BOLD + Font.ITALIC;
     final static float          FONT_SIZE_CHANGE_STEP     = 1.0f;
     final static float          SMALL_FONTS_BASE          = 8;
-    private final static String DEFAULT_FONT              = "Verdana";
+    private final static String DEFAULT_FONT              = "Arial Unicode MS";
     private Font                _base_font;
     private boolean             _decreased_size_by_system = false;
     private FontMetrics         _fm_large;
@@ -87,6 +87,36 @@ public final class TreeFontSet {
         return _small_max_descent;
     }
 
+    private Font getLargeFontSystem() {
+        return _large_font_system;
+    }
+
+    private void intializeFonts() {
+        final int small_size = getBaseFont().getSize() - 2;
+        int italic = Font.ITALIC;
+        if ( getBaseFont().getStyle() == Font.BOLD ) {
+            italic = italic + Font.BOLD;
+        }
+        _small_font = new Font( getBaseFont().getFontName(), getBaseFont().getStyle(), small_size );
+        _large_font = new Font( getBaseFont().getFontName(), getBaseFont().getStyle(), 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_font_memory = _small_font;
+        _large_font_memory = _large_font;
+        setupFontMetrics();
+    }
+
+    private void setDecreasedSizeBySystem( final boolean decreased_size_by_system ) {
+        _decreased_size_by_system = decreased_size_by_system;
+    }
+
+    private void setupFontMetrics() {
+        _fm_small = _owner.getFontMetrics( _small_font );
+        _fm_large = _owner.getFontMetrics( _large_font );
+        _small_max_descent = _fm_small.getMaxDescent();
+        _small_max_ascent = _fm_small.getMaxAscent() + 1;
+    }
+
     void decreaseFontSize( final int min, final boolean decreased_size_by_system ) {
         if ( decreased_size_by_system && !isDecreasedSizeBySystem() ) {
             _small_font_memory = _small_font;
@@ -151,7 +181,7 @@ public final class TreeFontSet {
 
     void smallFonts() {
         setDecreasedSizeBySystem( false );
-        _small_font = _small_font.deriveFont( SMALL_FONTS_BASE - 1 );
+        _small_font = _small_font.deriveFont( SMALL_FONTS_BASE - 2 );
         _large_font = _large_font.deriveFont( SMALL_FONTS_BASE );
         setupFontMetrics();
     }
@@ -159,44 +189,14 @@ public final class TreeFontSet {
     void superTinyFonts() {
         setDecreasedSizeBySystem( false );
         _small_font = _small_font.deriveFont( 2f );
-        _large_font = _large_font.deriveFont( 3f );
+        _large_font = _large_font.deriveFont( 4f );
         setupFontMetrics();
     }
 
     void tinyFonts() {
         setDecreasedSizeBySystem( false );
-        _small_font = _small_font.deriveFont( 5f );
+        _small_font = _small_font.deriveFont( 4f );
         _large_font = _large_font.deriveFont( 6f );
         setupFontMetrics();
     }
-
-    private Font getLargeFontSystem() {
-        return _large_font_system;
-    }
-
-    private void intializeFonts() {
-        final int small_size = getBaseFont().getSize() - 1;
-        int italic = Font.ITALIC;
-        if ( getBaseFont().getStyle() == Font.BOLD ) {
-            italic = italic + Font.BOLD;
-        }
-        _small_font = new Font( getBaseFont().getFontName(), getBaseFont().getStyle(), small_size );
-        _large_font = new Font( getBaseFont().getFontName(), getBaseFont().getStyle(), 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_font_memory = _small_font;
-        _large_font_memory = _large_font;
-        setupFontMetrics();
-    }
-
-    private void setDecreasedSizeBySystem( final boolean decreased_size_by_system ) {
-        _decreased_size_by_system = decreased_size_by_system;
-    }
-
-    private void setupFontMetrics() {
-        _fm_small = _owner.getFontMetrics( _small_font );
-        _fm_large = _owner.getFontMetrics( _large_font );
-        _small_max_descent = _fm_small.getMaxDescent();
-        _small_max_ascent = _fm_small.getMaxAscent() + 1;
-    }
 }