diff options
| author | matteocam <matteo.campanelli@gmail.com> | 2014-06-17 15:36:41 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-06-30 22:54:43 +0200 |
| commit | 64de49e9b26b7a65e63c24e930ef7e42372d26ba (patch) | |
| tree | 1089a54d96c5c8fd114a44e2fdbf78137ac35521 /drawinglayer | |
| parent | c2d5c39b0c9559b772027a8182c5670c1b2dc7e0 (diff) | |
Fill Color in VclProcessor2D is set out of decorated text if-block
Change-Id: Ice01290d7baa46f694b2bf5801b6af48f083d521
(cherry picked from commit fe0b0c0648a6339f979fe8faa7d997c6b5ac0637)
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/processor2d/vclprocessor2d.cxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 54aef7426101..9b904718d9d2 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -146,6 +146,14 @@ namespace drawinglayer fRotate, rTextCandidate.getLocale())); + // set FillColor Attribute + const Color aFillColor( rTextCandidate.getTextFillColor() ); + if( aFillColor != COL_TRANSPARENT ) + { + aFont.SetFillColor(aFillColor); + aFont.SetTransparent(false); + } + // Don't draw fonts without height if( aFont.GetHeight() <= 0 ) return; @@ -187,17 +195,6 @@ namespace drawinglayer if( eFontStrikeout != STRIKEOUT_NONE ) aFont.SetStrikeout( eFontStrikeout ); - // set FillColor Attribute - // FIXME(matteocam) - - // XXX: is "Color" the right type? i.e. can we use class Color in TextSimplePortionPrimitive2D - const Color aFillColor(pTCPP->getTextFillColor() ); - if( aFillColor != COL_TRANSPARENT ) - { - aFont.SetFillColor(aFillColor); - aFont.SetTransparent(false); - } - // set EmphasisMark attribute FontEmphasisMark eFontEmphasisMark = EMPHASISMARK_NONE; |