JAL-3186 ensure transparency slider position is updated on revert

[jalview.git] / src / jalview / gui / FeatureSettings.java

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index 0ab288c..3efc63e 100644 (file)
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -188,12 +188,22 @@ public class FeatureSettings extends JPanel
   {
     // save transparency for restore on Cancel
     originalTransparency = fr.getTransparency();
-    int originalTransparencyAsPercent = (int) (originalTransparency * 100);
-    transparency.setMaximum(100 - originalTransparencyAsPercent);
+
+    updateTransparencySliderFromFR();
 
     originalFilters = new HashMap<>(fr.getFeatureFilters()); // shallow copy
     originalViewStyle = new ViewStyle(af.viewport.getViewStyle());
   }
+
+  private void updateTransparencySliderFromFR()
+  {
+    boolean incon = inConstruction;
+    inConstruction = true;
+
+    int transparencyAsPercent = (int) (fr.getTransparency() * 100);
+    transparency.setValue(100 - transparencyAsPercent);
+    inConstruction = incon;
+  }
   /**
    * Constructor
    * 
@@ -203,7 +213,9 @@ public class FeatureSettings extends JPanel
   {
     this.af = alignFrame;
     fr = af.getFeatureRenderer();
+
     storeOriginalSettings();
+
     try
     {
       jbInit();
@@ -1303,13 +1315,14 @@ public class FeatureSettings extends JPanel
             ? "action.undo_changes_to_feature_settings"
             : "action.undo_changes_to_feature_settings_and_close_the_dialog"));
     cancel.setFont(JvSwingUtils.getLabelFont());
-    // TODO: disable cancel until current settings are different
+    // TODO: disable cancel (and apply!) until current settings are different
     cancel.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
         revert();
+        refreshDisplay();
         if (!hasComplement)
         {
           close();
@@ -2052,6 +2065,7 @@ public class FeatureSettings extends JPanel
     fr.setFeatureFilters(originalFilters);
     updateFeatureRenderer(originalData);
     af.getViewport().setViewStyle(originalViewStyle);
+    updateTransparencySliderFromFR();
     updateComplementButtons();
     refreshDisplay();
   }