From ad64b8b197a0899ee860dd98a07e8d4e035bb46c Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Thu, 8 May 2014 18:16:39 -0500 Subject: [PATCH] Issue #2920 Fix default color of BOXED text. Former-commit-id: ee99dba9330c21d2de5d495b3ec4b43520a84fed [formerly 60479824d1980103af249a00bb28b9387a031de6] [formerly 87ea43cf0de730b49ec6b6af0c808b94dcff9dc1] [formerly 9d4c33ba911a522adf958562e02fc0a1f83c6f34 [formerly 87ea43cf0de730b49ec6b6af0c808b94dcff9dc1 [formerly 59f12cd4cc60f0908c106cbc0572d3f84d0d509b]]] Former-commit-id: 9d4c33ba911a522adf958562e02fc0a1f83c6f34 Former-commit-id: faee1aa6dd05debf6ff2f60a54d18fa91ba9f91e [formerly 199a2df79e9fe8b2591012f4cfcb03bd5a4ae02b] Former-commit-id: 082a5c515db8ebdc9d54b27bbc598b2a84096cc3 --- .../src/com/raytheon/viz/core/gl/internal/GLTarget.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java index 5ba729b223..5dc4bddf98 100644 --- a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java +++ b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java @@ -144,6 +144,7 @@ import com.sun.opengl.util.j2d.TextRenderer; * if changed * Apr 04, 2014 2920 bsteffen Allow strings to use mulitple styles. * Apr 08, 2014 2950 bsteffen Reduce oversized colormaps. + * May 08, 2014 2920 bsteffen Fix default color of BOXED text. * * * @@ -1956,8 +1957,7 @@ public class GLTarget extends AbstractGraphicsTarget implements IGLTarget { gl.glColor4d(dString.boxColor.red / 255.0, dString.boxColor.green / 255.0, dString.boxColor.blue / 255.0, alpha); - } - if (blanked) { + } else { gl.glColor4d(backgroundColor.red / 255.0, backgroundColor.green / 255.0, backgroundColor.blue / 255.0, alpha);