Differential D2152 Diff 5131 src/lib/marble/graphicsview/MarbleGraphicsItem.cpp

Changeset View

Standalone View

View Options

src/lib/marble/graphicsview/MarbleGraphicsItem.cpp

Context not available.
57 if ( ItemCoordinateCache == cacheMode() 57​ if ( ItemCoordinateCache == cacheMode()
58 || DeviceCoordinateCache == cacheMode() ) 58​ || DeviceCoordinateCache == cacheMode() )
59 { 59​ {
60 const QSize neededPixmapSize = size().toSize() + QSize( 1, 1 ); // adding a pixel for rounding errors 60​ const qreal scale = painter->device()->devicePixelRatio();
61 if ( p()->m_pixmap.size() != neededPixmapSize ) { ​
62 61​
63 if ( p()->m_pixmap.size() != neededPixmapSize ) { 62​ const QSize neededPixmapSize = scale * size().toSize() + QSize( 1, 1 ); // adding a pixel for rounding errors
nienhueserUnsubmitted
Not Done

I think the bracket is wrong, the + QSize(1,1) should be done outside (after the scale multiplication)

nienhueser: I think the bracket is wrong, the + QSize(1,1) should be done outside (after the scale…
64 if ( size().isValid() && !size().isNull() ) { 63​
65 p()->m_pixmap = QPixmap( neededPixmapSize ); 64​ if ( p()->m_pixmap.size() != neededPixmapSize ||
66 } 65​ p()->m_pixmap.devicePixelRatio() != scale ) {
67 else { 66​
68 mDebug() << "Warning: Invalid pixmap size suggested: " << d->m_size; 67​
69 } 68​ if ( size().isValid() && !size().isNull() ) {
69​ p()->m_pixmap = QPixmap( neededPixmapSize );
70​ p()->m_pixmap.setDevicePixelRatio( scale );
71​ }
72​ else {
73​ mDebug() << "Warning: Invalid pixmap size suggested: " << d->m_size;
70 } 74​ }
71 75​
72 p()->m_pixmap.fill( Qt::transparent ); 76​ p()->m_pixmap.fill( Qt::transparent );
Context not available.