git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9eabd6d
)
JAL-2401 don't apply lower case colour to upper case
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 30 Mar 2017 11:48:42 +0000
(12:48 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 30 Mar 2017 11:48:42 +0000
(12:48 +0100)
src/jalview/gui/UserDefinedColours.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/UserDefinedColours.java
b/src/jalview/gui/UserDefinedColours.java
index
463d8cd
..
6e9a121
100755
(executable)
--- a/
src/jalview/gui/UserDefinedColours.java
+++ b/
src/jalview/gui/UserDefinedColours.java
@@
-72,7
+72,7
@@
public class UserDefinedColours extends GUserDefinedColours implements
private static final String LAST_DIRECTORY = "LAST_DIRECTORY";
private static final String LAST_DIRECTORY = "LAST_DIRECTORY";
- private static final int MY_FRAME_HEIGHT = 420;
+ private static final int MY_FRAME_HEIGHT = 440;
private static final int MY_FRAME_WIDTH = 810;
private static final int MY_FRAME_WIDTH = 810;
@@
-277,14
+277,9
@@
public class UserDefinedColours extends GUserDefinedColours implements
{
JButton button = null;
final Color newColour = colorChooser.getColor();
{
JButton button = null;
final Color newColour = colorChooser.getColor();
- for (int i = 0; i < selectedButtons.size(); i++)
- {
- button = selectedButtons.get(i);
- button.setBackground(newColour);
- button.setForeground(ColorUtils.brighterThan(newColour));
- }
if (lcaseColour.isSelected())
{
if (lcaseColour.isSelected())
{
+ selectedButtons.clear();
for (int i = 0; i < lowerCaseButtons.size(); i++)
{
button = lowerCaseButtons.get(i);
for (int i = 0; i < lowerCaseButtons.size(); i++)
{
button = lowerCaseButtons.get(i);
@@
-292,6
+287,12
@@
public class UserDefinedColours extends GUserDefinedColours implements
button.setForeground(ColorUtils.brighterThan(button.getBackground()));
}
}
button.setForeground(ColorUtils.brighterThan(button.getBackground()));
}
}
+ for (int i = 0; i < selectedButtons.size(); i++)
+ {
+ button = selectedButtons.get(i);
+ button.setBackground(newColour);
+ button.setForeground(ColorUtils.brighterThan(newColour));
+ }
}
/**
}
/**