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
Merge branch 'develop' into releases/Release_2_11_2_Branch
[jalview.git]
/
src
/
jalview
/
renderer
/
OverviewResColourFinder.java
diff --git
a/src/jalview/renderer/OverviewResColourFinder.java
b/src/jalview/renderer/OverviewResColourFinder.java
index
07fc6e3
..
a497d92
100644
(file)
--- a/
src/jalview/renderer/OverviewResColourFinder.java
+++ b/
src/jalview/renderer/OverviewResColourFinder.java
@@
-36,14
+36,19
@@
public class OverviewResColourFinder extends ResidueColourFinder
boolean useLegacy = false;
boolean useLegacy = false;
+ public static final Color OVERVIEW_DEFAULT_GAP = Color.lightGray;
+
+ public static final Color OVERVIEW_DEFAULT_LEGACY_GAP = Color.white;
+
+ public static final Color OVERVIEW_DEFAULT_HIDDEN = Color.darkGray
+ .darker();
+
/**
* Constructor without colour settings (used by applet)
*/
public OverviewResColourFinder()
{
/**
* Constructor without colour settings (used by applet)
*/
public OverviewResColourFinder()
{
- GAP_COLOUR = Color.lightGray;
- RESIDUE_COLOUR = Color.white;
- HIDDEN_COLOUR = Color.DARK_GRAY.darker();
+ this(false, OVERVIEW_DEFAULT_GAP, OVERVIEW_DEFAULT_HIDDEN);
}
/**
}
/**
@@
-84,8
+89,8
@@
public class OverviewResColourFinder extends ResidueColourFinder
// settings
if (shader.getColourScheme() != null)
{
// settings
if (shader.getColourScheme() != null)
{
- if (!shader.getColourScheme().hasGapColour()
- && Comparison.isGap(currentChar))
+ if (Comparison.isGap(currentChar)
+ && (!shader.getColourScheme().hasGapColour()))
{
resBoxColour = GAP_COLOUR;
}
{
resBoxColour = GAP_COLOUR;
}