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

INTEGRATION: CWS thb30fixes (1.20.6); FILE MERGED

Browse Source 
2008/06/25 10:18:25 thb 1.20.6.3: #i74202# Shrinked outline stroke width a bit; moved rendering of underline geometry in front of glyph outlines
2008/06/23 12:30:07 thb 1.20.6.2: #i10000# Fixed build breakage
2008/06/20 15:43:49 thb 1.20.6.1: #i74202# Fixed underline rendering for outline text
This commit is contained in:
Rüdiger Timm
2008-07-11 06:11:51 +00:00
parent bcf7da6f46
commit 71d8cf7146
1 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
cppcanvas/source/mtfrenderer/textaction.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: textaction.cxx,v $
* $Revision: 1.21 $
* $Revision: 1.22 $
*
* This file is part of OpenOffice.org.
*
@@ -1641,7 +1641,7 @@ namespace cppcanvas
VirtualDevice& rVDev )
{
const ::basegfx::B2DSize aFontSize( 0,
rVDev.GetFont().GetHeight() / 32.0 );
rVDev.GetFont().GetHeight() / 64.0 );
const double nOutlineWidth(
(rState.mapModeTransform * aFontSize).getY() );
@@ -1755,21 +1755,26 @@ namespace cppcanvas
// TODO(P1): implement caching
// underlines/strikethrough
rCanvas->fillPolyPolygon( mxTextLines,
rViewState,
rRenderState );
// background of text
mpCanvas->getUNOCanvas()->fillPolyPolygon( mxTextPoly,
rViewState,
aLocalState );
rCanvas->fillPolyPolygon( mxTextPoly,
rViewState,
aLocalState );
// border line of text
mpCanvas->getUNOCanvas()->strokePolyPolygon( mxTextPoly,
rViewState,
rRenderState,
aStrokeAttributes );
rCanvas->strokePolyPolygon( mxTextPoly,
rViewState,
rRenderState,
aStrokeAttributes );
// underlines/strikethrough - background
rCanvas->fillPolyPolygon( mxTextLines,
rViewState,
aLocalState );
// underlines/strikethrough - border
rCanvas->strokePolyPolygon( mxTextLines,
rViewState,
rRenderState,
aStrokeAttributes );
return true;
}
@@ -1839,10 +1844,15 @@ namespace cppcanvas
rRenderState,
aStrokeAttributes );
// underlines/strikethrough
mrCanvas->drawPolyPolygon( mrLinePolygon,
// underlines/strikethrough - background
mrCanvas->fillPolyPolygon( mrLinePolygon,
mrViewState,
rRenderState );
aLocalState );
// underlines/strikethrough - border
mrCanvas->strokePolyPolygon( mrLinePolygon,
mrViewState,
rRenderState,
aStrokeAttributes );
return true;
}