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

Resolves: tdf#137071 draw canvas under/over lines after background

Browse Source 
Change-Id: I066529af010ca4e34b370e462b3e9de1173e6096
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103531
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2020-09-28 09:04:37 +01:00
parent 76597aa62a
commit 269cf9dabc
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -904,10 +904,6 @@ namespace cppcanvas::internal
const rendering::ViewState& rViewState( mpCanvas->getViewState() ); const rendering::ViewState& rViewState( mpCanvas->getViewState() );
const uno::Reference< rendering::XCanvas >& rCanvas( mpCanvas->getUNOCanvas() ); const uno::Reference< rendering::XCanvas >& rCanvas( mpCanvas->getUNOCanvas() );
rCanvas->fillPolyPolygon( mxTextLines,
rViewState,
rRenderState );
//rhbz#1589029 non-transparent text fill background support //rhbz#1589029 non-transparent text fill background support
if (rTextFillColor != COL_AUTO) if (rTextFillColor != COL_AUTO)
{ {
@@ -919,6 +915,11 @@ namespace cppcanvas::internal
rCanvas->fillPolyPolygon(xTextBounds, rViewState, aLocalState); rCanvas->fillPolyPolygon(xTextBounds, rViewState, aLocalState);
} }
// under/over lines
rCanvas->fillPolyPolygon( mxTextLines,
rViewState,
rRenderState );
rCanvas->drawText( maStringContext, mxFont, rCanvas->drawText( maStringContext, mxFont,
rViewState, rViewState,
rRenderState, rRenderState,
@@ -1367,8 +1368,6 @@ namespace cppcanvas::internal
const rendering::ViewState& rViewState( mpCanvas->getViewState() ); const rendering::ViewState& rViewState( mpCanvas->getViewState() );
const uno::Reference< rendering::XCanvas >& rCanvas( mpCanvas->getUNOCanvas() ); const uno::Reference< rendering::XCanvas >& rCanvas( mpCanvas->getUNOCanvas() );
maTextLinesHelper.render(rRenderState, bNormalText);
//rhbz#1589029 non-transparent text fill background support //rhbz#1589029 non-transparent text fill background support
if (rTextFillColor != COL_AUTO) if (rTextFillColor != COL_AUTO)
{ {
@@ -1380,6 +1379,9 @@ namespace cppcanvas::internal
rCanvas->fillPolyPolygon(xTextBounds, rViewState, aLocalState); rCanvas->fillPolyPolygon(xTextBounds, rViewState, aLocalState);
} }
// under/over lines
maTextLinesHelper.render(rRenderState, bNormalText);
rCanvas->drawTextLayout( mxTextLayout, rCanvas->drawTextLayout( mxTextLayout,
rViewState, rViewState,
rRenderState ); rRenderState );