From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 11 Apr 2007 14:30:49 +0000 (+0000)
Subject: SetTargetColour before dialog.show
X-Git-Tag: Release_2_3~252
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b390a772cdffb7edc500b0c4952a997853cdf0bb;p=jalview.git

SetTargetColour before dialog.show
---

diff --git a/src/jalview/appletgui/UserDefinedColours.java b/src/jalview/appletgui/UserDefinedColours.java
index aa260c5..282e757 100755
--- a/src/jalview/appletgui/UserDefinedColours.java
+++ b/src/jalview/appletgui/UserDefinedColours.java
@@ -87,9 +87,9 @@ public class UserDefinedColours
     caller = fr;
     originalColour = fr.colourPanel.getBackground();
     originalLabel = "Feature Colour";
-    setTargetColour(fr.colourPanel.getBackground());
-
     setForDialog("Select Feature Colour", alignframe);
+    setTargetColour(fr.colourPanel.getBackground());
+    dialog.show();
   }
 
   public UserDefinedColours(Component caller,
@@ -99,9 +99,9 @@ public class UserDefinedColours
     this.caller = caller;
     originalColour = col1;
     originalLabel = "Select Colour";
-    setTargetColour(col1);
-
     setForDialog("Select Colour", alignframe);
+    setTargetColour(col1);
+    dialog.show();
   }
 
 
@@ -141,7 +141,6 @@ public class UserDefinedColours
               + (alignframe.getSize().height - height) / 2,
               width, height);
 
-    dialog.show();
   }
 
   public void actionPerformed(ActionEvent evt)
@@ -298,6 +297,7 @@ public class UserDefinedColours
     R = col.getRed();
     G = col.getGreen();
     B = col.getBlue();
+
     rScroller.setValue(R);
     gScroller.setValue(G);
     bScroller.setValue(B);