[Libreoffice-commits] core.git: 2 commits - cppcanvas/source helpcontent2

[Ilmari Lauhakangas (via logerrit)]

 cppcanvas/source/mtfrenderer/textaction.cxx |   14 ++++++++------
 helpcontent2                                |    2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 46231b9219971f78cff91b483f73014f724601dd
Author:     Ilmari Lauhakangas <ilmari.lauhakangas at libreoffice.org>
AuthorDate: Mon Sep 28 14:51:02 2020 +0300
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Mon Sep 28 13:51:02 2020 +0200

    Update git submodules
    
    * Update helpcontent2 from branch 'master'
      to eefef8231b5fbbb4148fa57a5a01b5c160a4ad9b
      - Keep logo text colour white even when visited
    
        Change-Id: I5cad9cdaf606b2b809c8e8a39a0dbf82ce15f919
        Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103548
        Tested-by: Jenkins
        Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
        Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/helpcontent2 b/helpcontent2
index 77cce026db5d..eefef8231b5f 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 77cce026db5de5f8d25ee6fe05d084e4f1f1f11b
+Subproject commit eefef8231b5fbbb4148fa57a5a01b5c160a4ad9b
commit 269cf9dabcddb337557d6e4bcfaeaae4fe307891
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 28 09:04:37 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 28 13:50:50 2020 +0200

    Resolves: tdf#137071 draw canvas under/over lines after background
    
    Change-Id: I066529af010ca4e34b370e462b3e9de1173e6096
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103531
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

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