diff options
| author | matteocam <matteo.campanelli@gmail.com> | 2014-05-24 13:02:43 -0400 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-06-30 22:54:37 +0200 |
| commit | be085bf52324f8b1c7f59a3d49a39e14e04824df (patch) | |
| tree | a0203ad18eb78e02a602e610c8de96e2da079f6f /include | |
| parent | 039599e9d52461ea57a9690f847bbfe5bae6f3aa (diff) | |
Moved Text Filling Color in OutDev. Text Filling occurs in ImplDrawText
Change-Id: I9c75066a8dea32721757d0511a2af58c68408438
(cherry picked from commit b09cf493611f2521e66159287b88acc3c05d6d33)
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/font.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index 7102ef9ed05a..1a728f34bba9 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -61,7 +61,9 @@ public: FontAlign GetAlign() const; // XXX: now font has background iff it is (single-y) underlined + // also forces non transparency bool HasBackgroundColor() const { + return GetUnderline() == UNDERLINE_SINGLE; } diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 85e307671079..a0edcc7554c4 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1040,7 +1040,7 @@ public: void SetTextFillColor(); void SetTextFillColor( const Color& rColor ); Color GetTextFillColor() const; - bool IsTextFillColor() const { return !maFont.IsTransparent(); } + bool IsTextFillColor() const { return maFont.GetUnderline() == UNDERLINE_SINGLE; /*return !maFont.IsTransparent();*/ } void SetTextLineColor(); void SetTextLineColor( const Color& rColor ); @@ -1097,7 +1097,7 @@ private: SAL_DLLPRIVATE void ImplInitAboveTextLineSize(); - SAL_DLLPRIVATE bool ImplDrawTextDirect( SalLayout&, bool bTextLines, bool bTextBkg = false, sal_uInt32 flags = 0 ); + SAL_DLLPRIVATE bool ImplDrawTextDirect( SalLayout&, bool bTextLines, sal_uInt32 flags = 0 ); SAL_DLLPRIVATE void ImplDrawSpecialText( SalLayout& ); SAL_DLLPRIVATE void ImplDrawTextRect( long nBaseX, long nBaseY, long nX, long nY, long nWidth, long nHeight ); |