Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression in previous release that caused wide column icons to be scaled incorrectly

Browse Source
This commit is contained in:
Kovid Goyal 2016-09-04 20:15:00 +05:30
parent 494ccb9a82
commit 4c4042e2c2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/library/models.py
View File

@ -12,6 +12,7 @@ from itertools import groupby
from PyQt5.Qt import (QAbstractTableModel, Qt, pyqtSignal, QIcon, QImage, from PyQt5.Qt import (QAbstractTableModel, Qt, pyqtSignal, QIcon, QImage,
QModelIndex, QDateTime, QColor, QPixmap, QPainter, QApplication) QModelIndex, QDateTime, QColor, QPixmap, QPainter, QApplication)
from calibre import fit_image
from calibre.gui2 import error_dialog from calibre.gui2 import error_dialog
from calibre.utils.search_query_parser import ParseException from calibre.utils.search_query_parser import ParseException
from calibre.ebooks.metadata import fmt_sidx, authors_to_string, string_to_authors from calibre.ebooks.metadata import fmt_sidx, authors_to_string, string_to_authors
@ -128,13 +129,14 @@ class ColumnIcon(object): # {{{
d = os.path.join(config_dir, 'cc_icons', icon) d = os.path.join(config_dir, 'cc_icons', icon)
if (os.path.exists(d)): if (os.path.exists(d)):
bm = QPixmap(d) bm = QPixmap(d)
bm = bm.scaled(dim, dim, aspectRatioMode=Qt.KeepAspectRatio, transformMode=Qt.SmoothTransformation) scaled, nw, nh = fit_image(bm.width(), bm.height(), bm.width(), dim)
bm = bm.scaled(nw, nh, aspectRatioMode=Qt.IgnoreAspectRatio, transformMode=Qt.SmoothTransformation)
bm.setDevicePixelRatio(self.dpr) bm.setDevicePixelRatio(self.dpr)
icon_bitmaps.append(bm) icon_bitmaps.append(bm)
total_width += bm.width() total_width += bm.width()
if len(icon_bitmaps) > 1: if len(icon_bitmaps) > 1:
i = len(icon_bitmaps) i = len(icon_bitmaps)
result = QPixmap((i * dim) + ((i-1)*2), dim) result = QPixmap(total_width + ((i-1)*2), dim)
result.setDevicePixelRatio(self.dpr) result.setDevicePixelRatio(self.dpr)
result.fill(Qt.transparent) result.fill(Qt.transparent)
painter = QPainter(result) painter = QPainter(result)