diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-27 17:04:37 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2014-10-29 09:25:12 +0100 |
| commit | a0bdbc144299be3b77ceafdd28b23bf0e041a657 (patch) | |
| tree | 366a63cec58f19a9fbb382b9ed849f8b5cd4e736 /src/widgets/kernel/qwidgetbackingstore.cpp | |
| parent | 11e09a440b9b4e80878dc685f9d49d8a43ff6604 (diff) | |
Fix QWidget::scroll during painting
Calling scroll during painting fails in cases where the scroll is
attempted accelerated. This is easily fixed by not using accelerated
scrolling during painting.
Task-number: QTBUG-41615
Change-Id: I38d2428d5679c242f13d53793a3dc3b8e01b538f
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/widgets/kernel/qwidgetbackingstore.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidgetbackingstore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp index 00052c868f..9f014aa4fe 100644 --- a/src/widgets/kernel/qwidgetbackingstore.cpp +++ b/src/widgets/kernel/qwidgetbackingstore.cpp @@ -869,7 +869,7 @@ void QWidgetPrivate::scrollRect(const QRect &rect, int dx, int dy) QRect scrollRect = rect & clipRect(); bool overlapped = false; - bool accelerateScroll = accelEnv && isOpaque + bool accelerateScroll = accelEnv && isOpaque && !q_func()->testAttribute(Qt::WA_WState_InPaintEvent) && !(overlapped = isOverlapped(scrollRect.translated(data.crect.topLeft()))); if (!accelerateScroll) { |