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 'develop' into features/JAL-3187_uitweaks
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
0297a74
..
7c0c55c
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-1479,9
+1479,13
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
closeView(alignPanel);
}
}
closeView(alignPanel);
}
}
-
if (closeAllTabs)
{
if (closeAllTabs)
{
+ if (featureSettings != null && featureSettings.isOpen())
+ {
+ featureSettings.close();
+ featureSettings = null;
+ }
/*
* this will raise an INTERNAL_FRAME_CLOSED event and this method will
* be called recursively, with the frame now in 'closed' state
/*
* this will raise an INTERNAL_FRAME_CLOSED event and this method will
* be called recursively, with the frame now in 'closed' state
@@
-4691,6
+4695,11
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (parseFeaturesFile(file, sourceType))
{
alignPanel.paintAlignment(true, true);
if (parseFeaturesFile(file, sourceType))
{
alignPanel.paintAlignment(true, true);
+ SplitFrame splitFrame = (SplitFrame) getSplitViewContainer();
+ if (splitFrame != null)
+ {
+ splitFrame.repaint();
+ }
}
}
else
}
}
else