[Libreoffice-commits] core.git: vcl/win

Jan Holesovsky kendy at collabora.com
Wed Dec 3 08:53:40 PST 2014


 vcl/win/source/gdi/winlayout.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit fe8eddc8d31451550593cb5789b5b5b5071a8d11
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Dec 3 17:51:02 2014 +0100

    windows opengl: Call PreDraw() earlier in the text rendering too.
    
    Change-Id: I2a29082291338af6fcd25e931802b0267d7da6f3

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index e405e49..228e67a 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -218,13 +218,13 @@ void WinLayout::DrawText(SalGraphics& rGraphics) const
         WinOpenGLSalGraphicsImpl *pImpl = dynamic_cast<WinOpenGLSalGraphicsImpl*>(rWinGraphics.mpImpl.get());
         if (pImpl)
         {
+            pImpl->PreDraw();
+
             boost::scoped_ptr<OpenGLTexture> pTexture(aDC.getTexture());
             if (pTexture)
-            {
-                pImpl->PreDraw();
                 pImpl->DrawMask(*pTexture, salColor, aDC.getTwoRect());
-                pImpl->PostDraw();
-            }
+
+            pImpl->PostDraw();
         }
     }
 }


More information about the Libreoffice-commits mailing list