diff options
| author | miniak <milan.burda@gmail.com> | 2010-12-08 11:32:50 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-08 11:32:50 (GMT) |
| commit | 50fc438d989fe9e4ecb431e2f6a5e4d1ccafbeac (patch) | |
| tree | d887df83ddef688285de8f23985cde21685a5f6c /src/gui | |
| parent | bcdfd348e433f21f18711a1b6f7fee8248de767f (diff) | |
| download | Qt-50fc438d989fe9e4ecb431e2f6a5e4d1ccafbeac.zip Qt-50fc438d989fe9e4ecb431e2f6a5e4d1ccafbeac.tar.gz Qt-50fc438d989fe9e4ecb431e2f6a5e4d1ccafbeac.tar.bz2 | |
fix qFadeEffect windowOpacity issue on Windows
Merge-request: 2519
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/qeffects.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/widgets/qeffects.cpp b/src/gui/widgets/qeffects.cpp index b875aa4..77d5257 100644 --- a/src/gui/widgets/qeffects.cpp +++ b/src/gui/widgets/qeffects.cpp @@ -91,7 +91,6 @@ private: bool showWidget; QTimer anim; QElapsedTimer checkTime; - double windowOpacity; }; static QAlphaWidget* q_blend = 0; @@ -107,7 +106,6 @@ QAlphaWidget::QAlphaWidget(QWidget* w, Qt::WindowFlags f) #endif setAttribute(Qt::WA_NoSystemBackground, true); widget = w; - windowOpacity = w->windowOpacity(); alpha = 0; } @@ -116,7 +114,7 @@ QAlphaWidget::~QAlphaWidget() #if defined(Q_WS_WIN) && !defined(Q_WS_WINCE) // Restore user-defined opacity value if (widget) - widget->setWindowOpacity(windowOpacity); + widget->setWindowOpacity(1); #endif } @@ -255,10 +253,10 @@ void QAlphaWidget::render() alpha = 1; #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) - if (alpha >= windowOpacity || !showWidget) { + if (alpha >= 1 || !showWidget) { anim.stop(); qApp->removeEventFilter(this); - widget->setWindowOpacity(windowOpacity); + widget->setWindowOpacity(1); q_blend = 0; deleteLater(); } else { |