1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: Do not use blend function for GL windows with alpha.

Browse Source 
Task-number: QTBUG-34376

Change-Id: I81a5ee6ff14e5472eb1f3846577d86b615be34e0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Friedemann Kleint 2013-10-30 13:19:26 +02:00 committed by The Qt Project
parent 769abe8d2f
commit 44e68b9026
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/platforms/windows/qwindowswindow.cpp
View File

@ -305,7 +305,7 @@ bool QWindowsWindow::setWindowLayered(HWND hwnd, Qt::WindowFlags flags, bool has
#endif // Q_OS_WINCE #endif // Q_OS_WINCE
} }
static void setWindowOpacity(HWND hwnd, Qt::WindowFlags flags, bool hasAlpha, qreal level) static void setWindowOpacity(HWND hwnd, Qt::WindowFlags flags, bool hasAlpha, bool openGL, qreal level)
{ {
#ifdef Q_OS_WINCE // WINCE does not support that feature and microsoft explicitly warns to use those calls #ifdef Q_OS_WINCE // WINCE does not support that feature and microsoft explicitly warns to use those calls
Q_UNUSED(hwnd); Q_UNUSED(hwnd);
@ -314,8 +314,8 @@ static void setWindowOpacity(HWND hwnd, Qt::WindowFlags flags, bool hasAlpha, qr
Q_UNUSED(level); Q_UNUSED(level);
#else #else
if (QWindowsWindow::setWindowLayered(hwnd, flags, hasAlpha, level)) { if (QWindowsWindow::setWindowLayered(hwnd, flags, hasAlpha, level)) {
if (hasAlpha && (flags & Qt::FramelessWindowHint)) { if (hasAlpha && !openGL && (flags & Qt::FramelessWindowHint)) {
// Windows with alpha: Use blend function to update. // Non-GL windows with alpha: Use blend function to update.
BLENDFUNCTION blend = {AC_SRC_OVER, 0, (BYTE)(255.0 * level), AC_SRC_ALPHA}; BLENDFUNCTION blend = {AC_SRC_OVER, 0, (BYTE)(255.0 * level), AC_SRC_ALPHA};
QWindowsContext::user32dll.updateLayeredWindow(hwnd, NULL, NULL, NULL, NULL, NULL, 0, &blend, ULW_ALPHA); QWindowsContext::user32dll.updateLayeredWindow(hwnd, NULL, NULL, NULL, NULL, NULL, 0, &blend, ULW_ALPHA);
} else { } else {
@ -661,7 +661,7 @@ void WindowCreationData::initialize(HWND hwnd, bool frameChange, qreal opacityLe
EnableMenuItem(systemMenu, SC_CLOSE, MF_BYCOMMAND|MF_GRAYED); EnableMenuItem(systemMenu, SC_CLOSE, MF_BYCOMMAND|MF_GRAYED);
} }
setWindowOpacity(hwnd, flags, hasAlpha, opacityLevel); setWindowOpacity(hwnd, flags, hasAlpha, isGL, opacityLevel);
} else { // child. } else { // child.
SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, swpFlags); SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, swpFlags);
} }
@ -1745,7 +1745,9 @@ void QWindowsWindow::setOpacity(qreal level)
if (m_opacity != level) { if (m_opacity != level) {
m_opacity = level; m_opacity = level;
if (m_data.hwnd) if (m_data.hwnd)
setWindowOpacity(m_data.hwnd, m_data.flags, window()->format().hasAlpha(), level); setWindowOpacity(m_data.hwnd, m_data.flags,
window()->format().hasAlpha(), testFlag(OpenGLSurface),
level);
} }
} }