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_1_Branch
[jalview.git]
/
src
/
jalview
/
renderer
/
seqfeatures
/
FeatureRenderer.java
diff --git
a/src/jalview/renderer/seqfeatures/FeatureRenderer.java
b/src/jalview/renderer/seqfeatures/FeatureRenderer.java
index
a1980c7
..
2186d4a
100644
(file)
--- a/
src/jalview/renderer/seqfeatures/FeatureRenderer.java
+++ b/
src/jalview/renderer/seqfeatures/FeatureRenderer.java
@@
-20,6
+20,13
@@
*/
package jalview.renderer.seqfeatures;
*/
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;
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 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
public class FeatureRenderer extends FeatureRendererModel
{
private static final AlphaComposite NO_TRANSPARENCY = AlphaComposite
@@
-112,6
+112,10
@@
public class FeatureRenderer extends FeatureRendererModel
continue;
}
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),
g.setColor(Color.white);
int charOffset = (charWidth - fm.charWidth(s)) / 2;
g.drawString(String.valueOf(s),