mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetTextFillColor immediately before DrawTransparent. DrawTextRect commented

Browse Source 
Change-Id: Id283624484dfcda91546fd4965bc0b6b92614f55
(cherry picked from commit ebc7be61df384120f1d0420d3e4dc5e3ac5599f4)
This commit is contained in:
matteocam
2014-05-27 16:05:44 -04:00
committed by Fridrich Štrba
parent 44f6d7a2c5
commit dbff42a078
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vcl/source/outdev/text.cxx
View File

@@ -149,14 +149,14 @@ void OutputDevice::ImplDrawTextRect( long nBaseX, long nBaseY,
nX += nBaseX; nX += nBaseX;
nY += nBaseY; nY += nBaseY;
mpGraphics->DrawRect( nX, nY, nWidth, nHeight, this ); // original code //mpGraphics->DrawRect( nX, nY, nWidth, nHeight, this ); // original code
Rectangle aRect( Point( nX, nY ), Size( nWidth+1, nHeight+1 ) ); Rectangle aRect( Point( nX, nY ), Size( nWidth+1, nHeight+1 ) );
Polygon aPoly( aRect ); Polygon aPoly( aRect );
PolyPolygon aPolyPoly(aPoly); PolyPolygon aPolyPoly(aPoly);
DrawTransparent(aPolyPoly, 50); Color aColor = RGB_COLORDATA(0x66,0x66, 0xFF);
// Code above is wrong: it just messes up. SetTextFillColor(aColor);
DrawTransparent(aPolyPoly, 70);
} }
@@ -486,6 +486,7 @@ void OutputDevice::ImplDrawText( SalLayout& rSalLayout )
and the set it as the new filling color and the set it as the new filling color
*/ */
if (mbTextBackground) { if (mbTextBackground) {
// FIXME(matteocam)
// set right background // (XXX: now getting fixed color) // set right background // (XXX: now getting fixed color)
Color aColor = RGB_COLORDATA(0x66,0x66, 0xFF); // blue-ish Color aColor = RGB_COLORDATA(0x66,0x66, 0xFF); // blue-ish
// SetBackground does not work // SetBackground does not work