X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FUserDefinedColours.java;h=6e14146846376e4fdc85cc50a6316bcb5850c33a;hb=34d0e74532d41a1b46d253e0190baf6c7c29b8da;hp=aa260c5e023b9596cc0b0b313bb7a4f7049a8ace;hpb=0eca27bca577e774acd5aefb165e7c6396a1995e;p=jalview.git diff --git a/src/jalview/appletgui/UserDefinedColours.java b/src/jalview/appletgui/UserDefinedColours.java index aa260c5..6e14146 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.setVisible(true); } 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.setVisible(true); } @@ -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);