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

Book list: Fix incorrect rendering of yes/no icons when they are configured to have only two values. Fixes #1993051 [Improper display of custom column](https://bugs.launchpad.net/calibre/+bug/1993051)

Browse Source
This commit is contained in:
Kovid Goyal 2022-10-16 10:32:23 +05:30
parent 41668689d5
commit 3ff4979673
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/gui2/library/delegates.py
View File

@ -711,6 +711,7 @@ class CcBoolDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
''' '''
Delegate for custom_column bool data. Delegate for custom_column bool data.
''' '''
self.nuke_option_data = False
QStyledItemDelegate.__init__(self, parent) QStyledItemDelegate.__init__(self, parent)
self.table_widget = parent self.table_widget = parent
@ -735,7 +736,7 @@ class CcBoolDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
def setModelData(self, editor, model, index): def setModelData(self, editor, model, index):
val = {0:True, 1:False, 2:None}[editor.currentIndex()] val = {0:True, 1:False, 2:None}[editor.currentIndex()]
model.setData(index, (val), Qt.ItemDataRole.EditRole) model.setData(index, val, Qt.ItemDataRole.EditRole)
def setEditorData(self, editor, index): def setEditorData(self, editor, index):
m = index.model() m = index.model()
@ -747,12 +748,21 @@ class CcBoolDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
else 1 if not val else 0 else 1 if not val else 0
editor.setCurrentIndex(val) editor.setCurrentIndex(val)
def initStyleOption(self, option, index):
ret = super().initStyleOption(option, index)
if self.nuke_option_data:
option.icon = QIcon()
option.text = ''
option.features &= ~QStyleOptionViewItem.ViewItemFeature.HasDisplay & ~QStyleOptionViewItem.ViewItemFeature.HasDecoration
return ret
def paint(self, painter, option, index): def paint(self, painter, option, index):
text, icon = index.data(Qt.ItemDataRole.DisplayRole), index.data(Qt.ItemDataRole.DecorationRole) text, icon = index.data(Qt.ItemDataRole.DisplayRole), index.data(Qt.ItemDataRole.DecorationRole)
if (not text and not icon) or text or not icon: if (not text and not icon) or text or not icon:
return super().paint(painter, option, index) return super().paint(painter, option, index)
dummy = index.model().index(-1, -1) self.nuke_option_data = True
super().paint(painter, option, dummy) super().paint(painter, option, index)
self.nuke_option_data = False
style = QApplication.style() style = QApplication.style()
style.drawItemPixmap(painter, option.rect, Qt.AlignmentFlag.AlignCenter, icon) style.drawItemPixmap(painter, option.rect, Qt.AlignmentFlag.AlignCenter, icon)