diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-11-25 18:03:12 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-11-25 18:03:12 +0100 |
| commit | d45409468b98ada43c0536fc1b0ba5e221d5b9bf (patch) | |
| tree | 70a6ac647db3b686ce44273e6caf67fd20bd3805 | |
| parent | 29420563fce7a15def14b79965987d1c5c3f648c (diff) | |
windows opengl: Transparency of the native widgets.
Change-Id: Ifa6ba5735582effc27ac68556c2367077705d1d6
| -rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salnativewidgets-luna.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 7161dabbd293..4c36bb341468 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -610,7 +610,7 @@ OpenGLTexture* OpenGLCompatibleDC::getTexture() return NULL; // turn what's in the mpData into a texture - return new OpenGLTexture(maRects.mnSrcWidth, maRects.mnSrcHeight, GL_RGBA, GL_UNSIGNED_BYTE, reinterpret_cast<sal_uInt8*>(mpData)); + return new OpenGLTexture(maRects.mnSrcWidth, maRects.mnSrcHeight, GL_BGRA, GL_UNSIGNED_BYTE, reinterpret_cast<sal_uInt8*>(mpData)); } WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen, HWND hWnd): diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 0789d4cd6cf9..539af04a9870 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -1297,7 +1297,7 @@ bool WinSalGraphics::drawNativeControl( ControlType nType, return false; pImpl->PreDraw(); - pImpl->DrawTexture(*pBlackTexture, aBlackDC.getTwoRect()); // FIXME combine the textures - DrawTextureSynthesizedAlpha() + pImpl->DrawTextureDiff(*pWhiteTexture, *pBlackTexture, aBlackDC.getTwoRect()); pImpl->PostDraw(); bOk = true; |