From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 27 Jul 2020 15:46:47 +0000 (+0100)
Subject: Merge branch 'bug/JAL-2983negativeSliderMin' into releases/Release_2_11_1_Branch
X-Git-Tag: Release_2_11_1_1~22^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6b56f0140b759b789da51aa4ed327d43297a3a5d;p=jalview.git

Merge branch 'bug/JAL-2983negativeSliderMin' into releases/Release_2_11_1_Branch
Conflict in way transparency slider was inited - followed HEAD's pattern here.
---

6b56f0140b759b789da51aa4ed327d43297a3a5d
diff --cc src/jalview/gui/FeatureSettings.java
index b87e4bf,3a04b88..aeac959
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.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