JAL-2587 Progress bar sizing tweaks

[jalview.git] / src / jalview / gui / OverviewPanel.java

diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java
index ef064f4..74c2112 100755 (executable)
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@ -88,7 +88,7 @@ public class OverviewPanel extends JPanel implements Runnable,
 
     setLayout(new BorderLayout());
     progressPanel = new ProgressPanel(OverviewRenderer.UPDATE,
-            MessageManager.getString("label.oview_calc"));
+            MessageManager.getString("label.oview_calc"), getWidth());
     this.add(progressPanel, BorderLayout.SOUTH);
     oviewCanvas = new OverviewCanvas(od, av, progressPanel);
 
@@ -96,12 +96,35 @@ public class OverviewPanel extends JPanel implements Runnable,
 
     av.getRanges().addPropertyChangeListener(this);
 
+    // without this the overview window does not size to fit the overview canvas
+    setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
+
     addComponentListener(new ComponentAdapter()
     {
       @Override
       public void componentResized(ComponentEvent evt)
       {
-        updateOverviewImage();
+        // Resize is called on the initial display of the overview.
+        // This code adjusts sizes to account for the progress bar if it has not
+        // already been accounted for, which triggers another resize call for
+        // the correct sizing, at which point the overview image is updated.
+        // (This avoids a double recalculation of the image.)
+        if (getWidth() == od.getWidth() && getHeight() == od.getHeight()
+                + progressPanel.getHeight())
+        {
+          updateOverviewImage();
+        }
+        else
+        {
+          if ((getWidth() > 0) && (getHeight() > 0))
+          {
+            od.setWidth(getWidth());
+            od.setHeight(getHeight() - progressPanel.getHeight());
+          }
+
+          setPreferredSize(new Dimension(od.getWidth(),
+                  od.getHeight() + progressPanel.getHeight()));
+        }
       }
 
     });
@@ -159,7 +182,6 @@ public class OverviewPanel extends JPanel implements Runnable,
           }
         }
         else
-        // if (!av.getWrapAlignment())
         {
           if (!od.isPositionInBox(evt.getX(), evt.getY()))
           {
@@ -198,8 +220,6 @@ public class OverviewPanel extends JPanel implements Runnable,
         }
       }
     });
-
-    // updateOverviewImage();
   }
 
   /*
@@ -271,7 +291,7 @@ public class OverviewPanel extends JPanel implements Runnable,
     }
     
     setPreferredSize(new Dimension(od.getWidth(),
-            od.getHeight()));
+            od.getHeight() + progressPanel.getHeight()));
 
     if (oviewCanvas.restartDraw())
     {