From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 29 Jun 2020 10:06:39 +0000 (+0100)
Subject: Merge branch 'develop' into feature/JAL-3390hideUnmappedStructure
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0dedd282914b05258e76292aaba17045f40e446f;hp=ad94fe2f24935ae35a6531d52b706cea889196d2;p=jalview.git

Merge branch 'develop' into feature/JAL-3390hideUnmappedStructure

Conflicts:
	src/jalview/jbgui/GStructureViewer.java
---

diff --git a/src/jalview/gui/StructureViewerBase.java b/src/jalview/gui/StructureViewerBase.java
index 1bb651a..30bad9b 100644
--- a/src/jalview/gui/StructureViewerBase.java
+++ b/src/jalview/gui/StructureViewerBase.java
@@ -1300,6 +1300,9 @@ public abstract class StructureViewerBase extends GStructureViewer
         }
         forceClose = confirm == JvOptionPane.YES_OPTION;
       }
+    }
+    if (binding != null)
+    {
       binding.closeViewer(forceClose);
     }
     setAlignmentPanel(null);
diff --git a/src/jalview/jbgui/GStructureViewer.java b/src/jalview/jbgui/GStructureViewer.java
index 6e88d27..485d755 100644
--- a/src/jalview/jbgui/GStructureViewer.java
+++ b/src/jalview/jbgui/GStructureViewer.java
@@ -219,6 +219,11 @@ public abstract class GStructureViewer extends JInternalFrame
     statusPanel.add(statusBar, null);
   }
 
+  protected void fitToWindow_actionPerformed()
+  {
+    getBinding().focusView();
+  }
+
   protected void highlightSelection_actionPerformed()
   {
   }