git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug/JAL-2592userDefinedScheme' into develop
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
6b6ff9a
..
f4dd851
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-2945,7
+2945,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
public void showAllColumns_actionPerformed(ActionEvent e)
{
viewport.showAllHiddenColumns();
public void showAllColumns_actionPerformed(ActionEvent e)
{
viewport.showAllHiddenColumns();
- repaint();
+ alignPanel.paintAlignment(true);
viewport.sendSelection();
}
viewport.sendSelection();
}
@@
-2953,7
+2953,6
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
public void hideSelSequences_actionPerformed(ActionEvent e)
{
viewport.hideAllSelectedSeqs();
public void hideSelSequences_actionPerformed(ActionEvent e)
{
viewport.hideAllSelectedSeqs();
- // alignPanel.paintAlignment(true);
}
/**
}
/**
@@
-3200,10
+3199,6
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
viewport.setShowSequenceFeatures(showSeqFeatures.isSelected());
alignPanel.paintAlignment(true);
{
viewport.setShowSequenceFeatures(showSeqFeatures.isSelected());
alignPanel.paintAlignment(true);
- if (alignPanel.getOverviewPanel() != null)
- {
- alignPanel.getOverviewPanel().updateOverviewImage();
- }
}
/**
}
/**
@@
-3330,7
+3325,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
* 'User Defined' opens a panel to configure or load a
* user-defined colour scheme
*/
* 'User Defined' opens a panel to configure or load a
* user-defined colour scheme
*/
- if (ResidueColourScheme.USER_DEFINED.equals(name))
+ if (ResidueColourScheme.USER_DEFINED_MENU.equals(name))
{
new UserDefinedColours(alignPanel);
return;
{
new UserDefinedColours(alignPanel);
return;