Merge branch 'bug/JAL-2983negativeSliderMin' into releases/Release_2_11_1_Branch
authorJim Procter <jprocter@issues.jalview.org>
Mon, 27 Jul 2020 15:46:47 +0000 (16:46 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 27 Jul 2020 15:46:47 +0000 (16:46 +0100)
Conflict in way transparency slider was inited - followed HEAD's pattern here.

1  2 
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java

@@@ -162,11 -153,7 +162,11 @@@ public class FeatureSettings extends JP
  
    JPanel groupPanel;
  
-   JSlider transparency = new JSlider();
 -  JSlider transparency;
++  JSlider transparency= new JSlider();
 +
 +  private JCheckBox showComplementOnTop;
 +
 +  private JCheckBox showComplement;
  
    /*
     * when true, constructor is still executing - so ignore UI events