From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 2 Aug 2017 14:23:29 +0000 (+0200)
Subject: Merge branch 'develop' into features/JAL-2446NCList
X-Git-Tag: Release_2_10_3b1~164
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c08e2b8bee548a52de87f67325ae71d5a02944ba;hp=-c;p=jalview.git

Merge branch 'develop' into features/JAL-2446NCList
---

c08e2b8bee548a52de87f67325ae71d5a02944ba
diff --combined src/jalview/gui/AlignFrame.java
index e5d550f,2a4b6dc..162d100
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@@ -2442,6 -2442,7 +2442,6 @@@ public class AlignFrame extends GAlignF
      viewport.setSelectionGroup(null);
      viewport.getColumnSelection().clear();
      viewport.setSelectionGroup(null);
 -    alignPanel.getSeqPanel().seqCanvas.highlightSearchResults(null);
      alignPanel.getIdPanel().getIdCanvas().searchResults = null;
      // JAL-2034 - should delegate to
      // alignPanel to decide if overview needs
@@@ -2944,7 -2945,7 +2944,7 @@@
    public void showAllColumns_actionPerformed(ActionEvent e)
    {
      viewport.showAllHiddenColumns();
-     repaint();
+     alignPanel.paintAlignment(true);
      viewport.sendSelection();
    }
  
@@@ -2952,7 -2953,6 +2952,6 @@@
    public void hideSelSequences_actionPerformed(ActionEvent e)
    {
      viewport.hideAllSelectedSeqs();
-     // alignPanel.paintAlignment(true);
    }
  
    /**