Merge "Issue #2920 Fix default color of BOXED text." into omaha_14.3.1

Former-commit-id: 0218777451 [formerly 00642fb2c6] [formerly 508b1f7a16] [formerly d7e4827ec4 [formerly 508b1f7a16 [formerly 7586d91814535ff6ad1f620f973279fe17914e6b]]]
Former-commit-id: d7e4827ec4
Former-commit-id: 82f6b0b5b7703cbb3ead5a955a74de67dabf3125 [formerly 649f316001]
Former-commit-id: 60a824728d
This commit is contained in:
Nate Jensen 2014-05-09 09:23:15 -05:00 committed by Gerrit Code Review
commit 99765ab821

View file

@ -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.
*
* </pre>
*
@ -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);