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

Mac: Improve transformed QGraphicsProxyWidgets

Browse Source 
Restore Mac code paths from Qt 4.

Task-number: QTBUG-29139
Change-Id: I2893ddf6015e2bda92d4a16980dbe2c9021eeef7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Morten Johan Sørvig 2014-01-06 12:21:21 +01:00 committed by The Qt Project
parent bbee8ca485
commit 03b6a2f0f9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/graphicsview/qgraphicswidget.cpp
View File

@ -2274,7 +2274,7 @@ void QGraphicsWidget::paintWindowFrame(QPainter *painter, const QStyleOptionGrap
const QPointF styleOrigin = this->windowFrameRect().topLeft(); const QPointF styleOrigin = this->windowFrameRect().topLeft();
painter->translate(styleOrigin); painter->translate(styleOrigin);
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
const QSize pixmapSize = windowFrameRect.size(); const QSize pixmapSize = windowFrameRect.size();
if (pixmapSize.width() <= 0 || pixmapSize.height() <= 0) if (pixmapSize.width() <= 0 || pixmapSize.height() <= 0)
return; return;
@ -2342,7 +2342,7 @@ void QGraphicsWidget::paintWindowFrame(QPainter *painter, const QStyleOptionGrap
frameOptions.midLineWidth = 1; frameOptions.midLineWidth = 1;
style()->drawPrimitive(QStyle::PE_FrameWindow, &frameOptions, painter, widget); style()->drawPrimitive(QStyle::PE_FrameWindow, &frameOptions, painter, widget);
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
realPainter->drawPixmap(QPoint(), pm); realPainter->drawPixmap(QPoint(), pm);
delete painter; delete painter;
#endif #endif