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: cover an existing decoration when editing bool and decorated enum cells

Browse Source
This commit is contained in:
Charles Haley 2015-03-16 13:15:26 +01:00
parent 87832d2275
commit 7e976eb617
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ import sys
from PyQt5.Qt import (Qt, QApplication, QStyle, QIcon, QDoubleSpinBox, QStyleOptionViewItem, from PyQt5.Qt import (Qt, QApplication, QStyle, QIcon, QDoubleSpinBox, QStyleOptionViewItem,
QSpinBox, QStyledItemDelegate, QComboBox, QTextDocument, QMenu, QKeySequence, QSpinBox, QStyledItemDelegate, QComboBox, QTextDocument, QMenu, QKeySequence,
QAbstractTextDocumentLayout, QFont, QFontInfo, QDate, QDateTimeEdit, QDateTime, QAbstractTextDocumentLayout, QFont, QFontInfo, QDate, QDateTimeEdit, QDateTime,
QStyleOptionComboBox, QStyleOptionSpinBox, QLocale) QStyleOptionComboBox, QStyleOptionSpinBox, QLocale, QSize)
from calibre.gui2 import UNDEFINED_QDATETIME, error_dialog, rating_font from calibre.gui2 import UNDEFINED_QDATETIME, error_dialog, rating_font
from calibre.constants import iswindows from calibre.constants import iswindows
@ -35,13 +35,15 @@ class UpdateEditorGeometry(object):
# get the original size of the edit widget # get the original size of the edit widget
opt = QStyleOptionViewItem(option) opt = QStyleOptionViewItem(option)
self.initStyleOption(opt, index) self.initStyleOption(opt, index)
opt.showDecorationSelected = True
opt.decorationSize = QSize(0, 0) # We want the editor to cover the decoration
style = QApplication.style() style = QApplication.style()
initial_geometry = style.subElementRect(style.SE_ItemViewItemText, opt, None) initial_geometry = style.subElementRect(style.SE_ItemViewItemText, opt, None)
orig_width = initial_geometry.width() orig_width = initial_geometry.width()
# Compute the required width: the width that can show all of the current value # Compute the required width: the width that can show all of the current value
if hasattr(self, 'get_required_width'): if hasattr(self, 'get_required_width'):
new_width = self.get_required_width(editor, index, style, fm) new_width = self.get_required_width(editor, style, fm)
else: else:
# The line edit box seems to extend by the space consumed by an 'M'. # The line edit box seems to extend by the space consumed by an 'M'.
# So add that to the text # So add that to the text
@ -174,7 +176,7 @@ class RatingDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
sb.setSuffix(' ' + _('stars')) sb.setSuffix(' ' + _('stars'))
return sb return sb
def get_required_width(self, editor, index, style, fm): def get_required_width(self, editor, style, fm):
val = editor.maximum() val = editor.maximum()
text = editor.textFromValue(val) + editor.suffix() text = editor.textFromValue(val) + editor.suffix()
srect = style.itemTextRect(fm, editor.geometry(), Qt.AlignLeft, False, srect = style.itemTextRect(fm, editor.geometry(), Qt.AlignLeft, False,
@ -467,7 +469,7 @@ class CcNumberDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
val = 0 val = 0
editor.setValue(val) editor.setValue(val)
def get_required_width(self, editor, index, style, fm): def get_required_width(self, editor, style, fm):
val = editor.maximum() val = editor.maximum()
text = editor.textFromValue(val) text = editor.textFromValue(val)
srect = style.itemTextRect(fm, editor.geometry(), Qt.AlignLeft, False, srect = style.itemTextRect(fm, editor.geometry(), Qt.AlignLeft, False,
@ -506,13 +508,10 @@ class CcEnumDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
val = None val = None
model.setData(index, (val), Qt.EditRole) model.setData(index, (val), Qt.EditRole)
def get_required_width(self, editor, index, style, fm): def get_required_width(self, editor, style, fm):
m = index.model()
col = m.column_map[index.column()]
use_decorations = m.custom_columns[col]['display'].get('use_decorations', False)
srect = style.itemTextRect(fm, editor.geometry(), Qt.AlignLeft, False, srect = style.itemTextRect(fm, editor.geometry(), Qt.AlignLeft, False,
self.longest_text + u'M') self.longest_text + u'M')
return srect.width() + editor.iconSize().width() if use_decorations else 0 return srect.width()
def setEditorData(self, editor, index): def setEditorData(self, editor, index):
m = index.model() m = index.model()
@ -606,7 +605,7 @@ class CcBoolDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
self.longest_text = text self.longest_text = text
return editor return editor
def get_required_width(self, editor, index, style, fm): def get_required_width(self, editor, style, fm):
srect = style.itemTextRect(fm, editor.geometry(), Qt.AlignLeft, False, srect = style.itemTextRect(fm, editor.geometry(), Qt.AlignLeft, False,
self.longest_text + u'M') self.longest_text + u'M')
return srect.width() + editor.iconSize().width() return srect.width() + editor.iconSize().width()