X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FTreeCanvas.java;h=d1c6c614b6813fccbb3b0e74303f8dd93499df96;hb=153dd62dc91da13ae732600e6ea55ddbe15eab39;hp=f0e7b62c18b4497115716641719c4e22ded0392c;hpb=e6ae1a0869ced674b7032826527ad229e8efa8db;p=jalview.git diff --git a/src/jalview/appletgui/TreeCanvas.java b/src/jalview/appletgui/TreeCanvas.java index f0e7b62..d1c6c61 100755 --- a/src/jalview/appletgui/TreeCanvas.java +++ b/src/jalview/appletgui/TreeCanvas.java @@ -1,20 +1,19 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) - * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) + * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with Jalview. If not, see . */ package jalview.appletgui; @@ -406,7 +405,7 @@ public class TreeCanvas extends Panel implements MouseListener, { repaint(); } - + int width = scrollPane.getSize().width; int height = scrollPane.getSize().height; if (!fitToWindow) @@ -436,9 +435,9 @@ public class TreeCanvas extends Panel implements MouseListener, g.fillRect(0, 0, width, height); labelLength = g.getFontMetrics(font).stringWidth(longestName) + 20; // 20 - // allows - // for - // scrollbar + // allows + // for + // scrollbar float wscale = (float) (width - labelLength - offx * 2) / tree.getMaxHeight();