git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SetTargetColour before dialog.show
[jalview.git]
/
src
/
jalview
/
appletgui
/
UserDefinedColours.java
diff --git
a/src/jalview/appletgui/UserDefinedColours.java
b/src/jalview/appletgui/UserDefinedColours.java
index
aa260c5
..
282e757
100755
(executable)
--- a/
src/jalview/appletgui/UserDefinedColours.java
+++ b/
src/jalview/appletgui/UserDefinedColours.java
@@
-87,9
+87,9
@@
public class UserDefinedColours
caller = fr;
\r
originalColour = fr.colourPanel.getBackground();
\r
originalLabel = "Feature Colour";
\r
caller = fr;
\r
originalColour = fr.colourPanel.getBackground();
\r
originalLabel = "Feature Colour";
\r
- setTargetColour(fr.colourPanel.getBackground());
\r
-
\r
setForDialog("Select Feature Colour", alignframe);
\r
setForDialog("Select Feature Colour", alignframe);
\r
+ setTargetColour(fr.colourPanel.getBackground());
\r
+ dialog.show();
\r
}
\r
\r
public UserDefinedColours(Component caller,
\r
}
\r
\r
public UserDefinedColours(Component caller,
\r
@@
-99,9
+99,9
@@
public class UserDefinedColours
this.caller = caller;
\r
originalColour = col1;
\r
originalLabel = "Select Colour";
\r
this.caller = caller;
\r
originalColour = col1;
\r
originalLabel = "Select Colour";
\r
- setTargetColour(col1);
\r
-
\r
setForDialog("Select Colour", alignframe);
\r
setForDialog("Select Colour", alignframe);
\r
+ setTargetColour(col1);
\r
+ dialog.show();
\r
}
\r
\r
\r
}
\r
\r
\r
@@
-141,7
+141,6
@@
public class UserDefinedColours
+ (alignframe.getSize().height - height) / 2,
\r
width, height);
\r
\r
+ (alignframe.getSize().height - height) / 2,
\r
width, height);
\r
\r
- dialog.show();
\r
}
\r
\r
public void actionPerformed(ActionEvent evt)
\r
}
\r
\r
public void actionPerformed(ActionEvent evt)
\r
@@
-298,6
+297,7
@@
public class UserDefinedColours
R = col.getRed();
\r
G = col.getGreen();
\r
B = col.getBlue();
\r
R = col.getRed();
\r
G = col.getGreen();
\r
B = col.getBlue();
\r
+
\r
rScroller.setValue(R);
\r
gScroller.setValue(G);
\r
bScroller.setValue(B);
\r
rScroller.setValue(R);
\r
gScroller.setValue(G);
\r
bScroller.setValue(B);
\r