X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2FOverviewResColourFinder.java;h=a497d92d00d722af17995ec4eea7eb2853818b75;hb=c9150af4f9655e743ec53ec60ac5553f95e17636;hp=07fc6e3d9405889df90ff959fe7e510393743343;hpb=69dbb53dd5e77aed29eeea737414ebe2d74cebd4;p=jalview.git diff --git a/src/jalview/renderer/OverviewResColourFinder.java b/src/jalview/renderer/OverviewResColourFinder.java index 07fc6e3..a497d92 100644 --- a/src/jalview/renderer/OverviewResColourFinder.java +++ b/src/jalview/renderer/OverviewResColourFinder.java @@ -36,14 +36,19 @@ public class OverviewResColourFinder extends ResidueColourFinder 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() { - 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) { - if (!shader.getColourScheme().hasGapColour() - && Comparison.isGap(currentChar)) + if (Comparison.isGap(currentChar) + && (!shader.getColourScheme().hasGapColour())) { resBoxColour = GAP_COLOUR; }