summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-10-05 11:44:54 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-10-05 12:00:37 (GMT)
commit0ae8f0b63e6705790ad0bdb0f90644b557b5ac67 (patch)
tree6b6a2556f9861d3abe9de606f929584654f7021e /src
parent502c7d324141fb48a902ef475b4fd2932dc859c5 (diff)
downloadQt-0ae8f0b63e6705790ad0bdb0f90644b557b5ac67.zip
Qt-0ae8f0b63e6705790ad0bdb0f90644b557b5ac67.tar.gz
Qt-0ae8f0b63e6705790ad0bdb0f90644b557b5ac67.tar.bz2
Fixed pixeldust in translucent toplevel proxy widgets on Mac
Reviewed-by: Bjoern Erik Nilsen
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qwidget.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 2359812..4cbf762 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -5130,7 +5130,8 @@ void QWidgetPrivate::render_helper(QPainter *painter, const QPoint &targetOffset
return;
QPixmap pixmap(size);
- if (!(renderFlags & QWidget::DrawWindowBackground))
+ if (!(renderFlags & QWidget::DrawWindowBackground)
+ || !q->palette().brush(q->backgroundRole()).isOpaque())
pixmap.fill(Qt::transparent);
q->render(&pixmap, QPoint(), toBePainted, renderFlags);
@@ -11447,7 +11448,7 @@ QWidget *QWidgetPrivate::widgetInNavigationDirection(Direction direction)
const QRect targetCandidateRect = targetCandidate->rect().translated(targetCandidate->mapToGlobal(QPoint()));
- // For focus proxies, the child widget handling the focus can have keypad navigation focus,
+ // For focus proxies, the child widget handling the focus can have keypad navigation focus,
// but the owner of the proxy cannot.
// Additionally, empty widgets should be ignored.
if (targetCandidate->focusProxy() || targetCandidateRect.isEmpty())