Merge "Issue #2920 Fix default color of BOXED text." into omaha_14.3.1
Former-commit-id:0218777451
[formerly00642fb2c6
] [formerly508b1f7a16
] [formerlyd7e4827ec4
[formerly508b1f7a16
[formerly 7586d91814535ff6ad1f620f973279fe17914e6b]]] Former-commit-id:d7e4827ec4
Former-commit-id: 82f6b0b5b7703cbb3ead5a955a74de67dabf3125 [formerly649f316001
] Former-commit-id:60a824728d
This commit is contained in:
commit
99765ab821
1 changed files with 2 additions and 2 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Reference in a new issue