From fc43a34b6855aba8b90f5dff4b9eeb15748a4b5e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 26 Aug 2016 13:51:19 +0530 Subject: [PATCH] A couple more places that needed non-integer dpr support --- src/calibre/gui2/tweak_book/editor/insert_resource.py | 5 ++++- src/calibre/gui2/tweak_book/reports.py | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/tweak_book/editor/insert_resource.py b/src/calibre/gui2/tweak_book/editor/insert_resource.py index 50e67eeee2..75a4846e02 100644 --- a/src/calibre/gui2/tweak_book/editor/insert_resource.py +++ b/src/calibre/gui2/tweak_book/editor/insert_resource.py @@ -108,7 +108,10 @@ class ImageDelegate(QStyledItemDelegate): except: pass else: - dpr = painter.device().devicePixelRatio() + try: + dpr = painter.device().devicePixelRatioF() + except AttributeError: + dpr = painter.device().devicePixelRatio() cover.loadFromData(raw) cover.setDevicePixelRatio(dpr) if not cover.isNull(): diff --git a/src/calibre/gui2/tweak_book/reports.py b/src/calibre/gui2/tweak_book/reports.py index 5f54928ea0..e4643d4525 100644 --- a/src/calibre/gui2/tweak_book/reports.py +++ b/src/calibre/gui2/tweak_book/reports.py @@ -373,7 +373,11 @@ class ImagesDelegate(QStyledItemDelegate): k = (th, entry.name) pmap = self.cache.get(k) if pmap is None: - pmap = self.cache[k] = self.pixmap(th, entry, painter.device().devicePixelRatio()) + try: + dpr = painter.device().devicePixelRatioF() + except AttributeError: + dpr = painter.device().devicePixelRatio() + pmap = self.cache[k] = self.pixmap(th, entry, dpr) if pmap.isNull(): bottom = option.rect.top() else: