diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2015-04-14 20:01:15 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@digia.com> | 2015-04-15 12:54:15 +0200 |
| commit | 7ec765b1d10d26de2e13cb22364e45427b654d86 (patch) | |
| tree | b41a1ead7cd4bee427fd3b4f4b3a5e4a9ea47e99 /src/plugins/platforms | |
| parent | 56b72d7809a6016149668b7df0dfd35022ff01c6 (diff) | |
Use qreal for devicePixelRatio everywhere
QPaintDevice::devicePixelRatio() -> devicePixelRatioF()
Implement PdmDevicePixelRatioScaled for QPaintDevice subclasses.
Remove instances of casting to int.
Change-Id: I6e769d21e889bf8f88aedc1c49b53fef20a6709c
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoabackingstore.mm | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qprintengine_mac.mm | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/direct2d/qwindowsdirect2dpaintdevice.cpp | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm index 6a4f7ed8ee..cd8af5092a 100644 --- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm +++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm @@ -54,6 +54,7 @@ QPaintDevice *QCocoaBackingStore::paintDevice() // Receate the backing store buffer if the effective buffer size has changed, // either due to a window resize or devicePixelRatio change. QSize effectiveBufferSize = m_requestedSize * windowDevicePixelRatio; + if (m_qImage.size() != effectiveBufferSize) { QImage::Format format = (window()->format().hasAlpha() || cocoaWindow->m_drawContentBorderGradient) ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32; diff --git a/src/plugins/platforms/cocoa/qprintengine_mac.mm b/src/plugins/platforms/cocoa/qprintengine_mac.mm index 348b537691..56fc720a83 100644 --- a/src/plugins/platforms/cocoa/qprintengine_mac.mm +++ b/src/plugins/platforms/cocoa/qprintengine_mac.mm @@ -212,6 +212,9 @@ int QMacPrintEngine::metric(QPaintDevice::PaintDeviceMetric m) const case QPaintDevice::PdmDevicePixelRatio: val = 1; break; + case QPaintDevice::PdmDevicePixelRatioScaled: + val = 1 * QPaintDevice::devicePixelRatioFScale; + break; default: val = 0; qWarning("QPrinter::metric: Invalid metric command"); diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintdevice.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintdevice.cpp index fee9ad88fa..bc6590ef64 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintdevice.cpp +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintdevice.cpp @@ -113,6 +113,9 @@ int QWindowsDirect2DPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric) case QPaintDevice::PdmDevicePixelRatio: return 1; break; + case QPaintDevice::PdmDevicePixelRatioScaled: + return 1 * devicePixelRatioFScale; + break; case QPaintDevice::PdmWidthMM: case QPaintDevice::PdmHeightMM: return -1; |