[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/source

[Tomaž Vajngerl (via logerrit)]

 vcl/source/control/edit.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6de6f97e775d0c9426b51471d742ab5dd461b9df
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Wed Apr 17 12:24:17 2019 +0900
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Apr 23 15:11:59 2019 +0200

    tdf#124032 fix Edit background drawing
    
    IsPaintTransparent() is preventing to paint the background but
    not sure why this is needed. removing this condition doesn't
    seem to have any ill effects.
    
    Reviewed-on: https://gerrit.libreoffice.org/70855
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit 1e917af27d18d934f3e9122aa98cd950b74ca246)
    
    Change-Id: I5ac54e208e4f1c9941beb4012aa44182d21dbed9
    Reviewed-on: https://gerrit.libreoffice.org/70916
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 547f9464186d..6e4e49018bff 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -328,6 +328,7 @@ void Edit::ImplInit(vcl::Window* pParent, WinBits nStyle)
     SetCursor( new vcl::Cursor );
 
     SetPointer( Pointer( PointerStyle::Text ) );
+    ApplySettings(*this);
 
     uno::Reference< datatransfer::dnd::XDragGestureListener> xDGL( mxDnDListener, uno::UNO_QUERY );
     uno::Reference< datatransfer::dnd::XDragGestureRecognizer > xDGR = GetDragGestureRecognizer();
@@ -381,7 +382,7 @@ void Edit::ApplySettings(vcl::RenderContext& rRenderContext)
     Color aTextColor = rStyleSettings.GetFieldTextColor();
     ApplyControlForeground(rRenderContext, aTextColor);
 
-    if (ImplUseNativeBorder(rRenderContext, GetStyle()) || IsPaintTransparent())
+    if (ImplUseNativeBorder(rRenderContext, GetStyle()))
     {
         // Transparent background
         rRenderContext.SetBackground();