X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2Fseqfeatures%2FFeatureRenderer.java;h=aa3328b139f59aeb042c6d460a91ae7564eaed5c;hb=3975a73e927fe1adb8f3411f22c10a3e5e74ec73;hp=a1980c76e851058bbfd28db25dd74b45b7434ca4;hpb=74393b51f368cb9f58589472d432a433d9c4386d;p=jalview.git diff --git a/src/jalview/renderer/seqfeatures/FeatureRenderer.java b/src/jalview/renderer/seqfeatures/FeatureRenderer.java index a1980c7..aa3328b 100644 --- a/src/jalview/renderer/seqfeatures/FeatureRenderer.java +++ b/src/jalview/renderer/seqfeatures/FeatureRenderer.java @@ -20,6 +20,13 @@ */ package jalview.renderer.seqfeatures; +import java.awt.AlphaComposite; +import java.awt.Color; +import java.awt.FontMetrics; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.util.List; + import jalview.api.AlignViewportI; import jalview.api.FeatureColourI; import jalview.datamodel.ContiguousI; @@ -32,13 +39,6 @@ import jalview.util.Comparison; import jalview.util.ReverseListIterator; import jalview.viewmodel.seqfeatures.FeatureRendererModel; -import java.awt.AlphaComposite; -import java.awt.Color; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.util.List; - public class FeatureRenderer extends FeatureRendererModel { private static final AlphaComposite NO_TRANSPARENCY = AlphaComposite @@ -112,6 +112,10 @@ public class FeatureRenderer extends FeatureRendererModel continue; } + /* + * JAL-3045 text is always drawn over features, even if + * 'Show Text' is unchecked in the format menu + */ g.setColor(Color.white); int charOffset = (charWidth - fm.charWidth(s)) / 2; g.drawString(String.valueOf(s), @@ -319,7 +323,7 @@ public class FeatureRenderer extends FeatureRendererModel List overlaps = seq.getFeatures().findFeatures( visiblePositions.getBegin(), visiblePositions.getEnd(), type); - if (fc.isSimpleColour()) + if (overlaps.size() > 1 && fc.isSimpleColour()) { filterFeaturesForDisplay(overlaps); }