From dd5d56ab423fe3bdaa4c2f7e1f37f50d59a5b7e6 Mon Sep 17 00:00:00 2001 From: "PSp..om" Date: Thu, 14 Jul 2011 11:23:04 +0000 Subject: [PATCH] Return the base color for BitmapText.getColor() because other things make less sense... though no answer is exactly "right". git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7859 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/core/com/jme3/font/BitmapText.java | 2 +- engine/src/core/com/jme3/font/Letters.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/engine/src/core/com/jme3/font/BitmapText.java b/engine/src/core/com/jme3/font/BitmapText.java index 2245f050e..6a483c0e2 100644 --- a/engine/src/core/com/jme3/font/BitmapText.java +++ b/engine/src/core/com/jme3/font/BitmapText.java @@ -133,7 +133,7 @@ public class BitmapText extends Node { * @return color of the text */ public ColorRGBA getColor() { - return block.getColor(); + return letters.getBaseColor(); } /** diff --git a/engine/src/core/com/jme3/font/Letters.java b/engine/src/core/com/jme3/font/Letters.java index f99bc98ea..198c4974b 100644 --- a/engine/src/core/com/jme3/font/Letters.java +++ b/engine/src/core/com/jme3/font/Letters.java @@ -311,6 +311,10 @@ class Letters { setColor( 0, block.getText().length(), color ); } + ColorRGBA getBaseColor() { + return baseColor; + } + /** * @param start start index to set style. inclusive. * @param end end index to set style. EXCLUSIVE.