From 59b6fbdbe75f9f7b76bb97c9e1a281880c53a330 Mon Sep 17 00:00:00 2001 From: cmzmasek Date: Thu, 17 Jan 2013 19:35:33 +0000 Subject: [PATCH] in progress --- forester/java/src/org/forester/archaeopteryx/TreePanel.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/forester/java/src/org/forester/archaeopteryx/TreePanel.java b/forester/java/src/org/forester/archaeopteryx/TreePanel.java index a309225..5ae8e02 100644 --- a/forester/java/src/org/forester/archaeopteryx/TreePanel.java +++ b/forester/java/src/org/forester/archaeopteryx/TreePanel.java @@ -477,8 +477,6 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee /** * Set parameters for printing the displayed tree * - * @param x - * @param y */ final void calcParametersForPainting( final int x, final int y, final boolean recalc_longest_ext_node_info ) { // updateStyle(); not needed? @@ -489,7 +487,7 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee if ( getOptions().isAllowFontSizeChange() ) { if ( ( getLongestExtNodeInfo() > ( x * 0.6 ) ) && ( getTreeFontSet().getLargeFont().getSize() > 2 + TreeFontSet.FONT_SIZE_CHANGE_STEP ) ) { - while ( ( getLongestExtNodeInfo() > ( x * 0.6 ) ) + while ( ( getLongestExtNodeInfo() > ( x * 0.7 ) ) && ( getTreeFontSet().getLargeFont().getSize() > 2 ) ) { getMainPanel().getTreeFontSet().decreaseFontSize( getConfiguration().getMinBaseFontSize(), true ); @@ -497,7 +495,7 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee } } else { - while ( ( getLongestExtNodeInfo() < ( x * 0.5 ) ) + while ( ( getLongestExtNodeInfo() < ( x * 0.6 ) ) && ( getTreeFontSet().getLargeFont().getSize() <= getTreeFontSet().getLargeFontMemory() .getSize() - TreeFontSet.FONT_SIZE_CHANGE_STEP ) ) { getMainPanel().getTreeFontSet().increaseFontSize(); -- 1.7.10.2