git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50452c1 c6d5255)
Merge branch 'feature/JAL-3187linkedFeatures' into merge/JAL-3187_JAL-3010
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 19 Feb 2019 12:01:15 +0000 (12:01 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 19 Feb 2019 12:01:15 +0000 (12:01 +0000)
merge/JAL-3187_JAL-3010

Conflicts:
src/jalview/gui/FeatureSettings.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java

1  2 
src/jalview/gui/FeatureSettings.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/FeatureSettings.java
index 495cde6,47c0cc5..058de9c
--- 1/src/jalview/gui/FeatureSettings.java
--- 2/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@@ -210,9 -201,8 +214,10 @@@ public class FeatureSettings extends JP
      transparency.setMaximum(100 - originalTransparencyAsPercent);
  
      originalFilters = new HashMap<>(fr.getFeatureFilters()); // shallow copy
+     originalViewStyle = new ViewStyle(af.viewport.getViewStyle());
  
 +    topLevelTypes = new ArrayList<>();
 +
      try
      {
        jbInit();