diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 10 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget_p.h | 4 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget_qpa.cpp | 19 |
3 files changed, 28 insertions, 5 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index a42fd7aa72..0da28416a3 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -267,10 +267,12 @@ QWidgetPrivate::QWidgetPrivate(int version) #ifndef QT_NO_IM , inheritsInputMethodHints(0) #endif +#if defined(Q_OS_WIN) + , noPaintOnScreen(0) +#endif #if defined(Q_WS_X11) , picture(0) #elif defined(Q_WS_WIN) - , noPaintOnScreen(0) #ifndef QT_NO_GESTURES , nativeGesturePanEnabled(0) #endif @@ -9939,10 +9941,10 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on) Q_ASSERT_X(sizeof(d->high_attributes)*8 >= (Qt::WA_AttributeCount - sizeof(uint)*8), "QWidget::setAttribute(WidgetAttribute, bool)", "QWidgetPrivate::high_attributes[] too small to contain all attributes in WidgetAttribute"); -#ifdef Q_WS_WIN - // ### Don't use PaintOnScreen+paintEngine() to do native painting in 5.0 +#ifdef Q_OS_WIN + // ### Don't use PaintOnScreen+paintEngine() to do native painting in some future release if (attribute == Qt::WA_PaintOnScreen && on && !inherits("QGLWidget")) { - // see qwidget_win.cpp, ::paintEngine for details + // see qwidget_qpa.cpp, ::paintEngine for details paintEngine(); if (d->noPaintOnScreen) return; diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 9036b7a848..75d03f87af 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -694,6 +694,9 @@ public: #endif // *************************** Platform specific ************************************ +#if defined(Q_OS_WIN) + uint noPaintOnScreen : 1; // see qwidget_qpa.cpp ::paintEngine() +#endif #if defined(Q_WS_X11) // <----------------------------------------------------------- X11 Qt::HANDLE picture; static QWidget *mouseGrabber; @@ -708,7 +711,6 @@ public: QPoint mapToGlobal(const QPoint &pos) const; QPoint mapFromGlobal(const QPoint &pos) const; #elif defined(Q_WS_WIN) // <--------------------------------------------------------- WIN - uint noPaintOnScreen : 1; // see qwidget_win.cpp ::paintEngine() #ifndef QT_NO_GESTURES uint nativeGesturePanEnabled : 1; #endif diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index c524491d22..ef3d7a16d9 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -980,6 +980,25 @@ void QWidgetPrivate::setWSGeometry(bool dontShow, const QRect &oldRect) QPaintEngine *QWidget::paintEngine() const { qWarning("QWidget::paintEngine: Should no longer be called"); + +#ifdef Q_OS_WIN + // We set this bit which is checked in setAttribute for + // Qt::WA_PaintOnScreen. We do this to allow these two scenarios: + // + // 1. Users accidentally set Qt::WA_PaintOnScreen on X and port to + // Windows which would mean suddenly their widgets stop working. + // + // 2. Users set paint on screen and subclass paintEngine() to + // return 0, in which case we have a "hole" in the backingstore + // allowing use of GDI or DirectX directly. + // + // 1 is WRONG, but to minimize silent failures, we have set this + // bit to ignore the setAttribute call. 2. needs to be + // supported because its our only means of embedding native + // graphics stuff. + const_cast<QWidgetPrivate *>(d_func())->noPaintOnScreen = 1; +#endif + return 0; //##### @@@ } |