Force redrawing text when its color is changed.

This change fixes a regression of my previous change that it prevents changing the color of a TextShape object. This change passes a composite color to Shape.draw() so TextShape.draw() can redraw text with the composite color.