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

A couple more QFontMetrics::width

Browse Source
This commit is contained in:
Kovid Goyal 2021-11-21 18:37:25 +05:30
parent 8846f7fd44
commit bd354daa0e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/dialogs/template_dialog_code_widget.py
View File

@ -61,8 +61,8 @@ class CodeEditor(QPlainTextEdit):
def line_number_area_width(self): def line_number_area_width(self):
# get largest width of digits # get largest width of digits
w = self.fontMetrics() fm = self.fontMetrics()
self.number_width = max(map(lambda x:w.width(str(x)), range(10))) self.number_width = max(map(lambda x:fm.horizontalAdvance(str(x)), range(10)))
digits = 1 digits = 1
limit = max(1, self.blockCount()) limit = max(1, self.blockCount())
while limit >= 10: while limit >= 10:
@ -218,4 +218,3 @@ class CodeEditor(QPlainTextEdit):
ev.accept() ev.accept()
return return
QPlainTextEdit.keyPressEvent(self, ev) QPlainTextEdit.keyPressEvent(self, ev)

2
src/calibre/gui2/font_family_chooser.py
View File

@ -138,7 +138,7 @@ class FontFamilyDelegate(QStyledItemDelegate):
painter.drawText(r, Qt.AlignmentFlag.AlignVCenter|Qt.AlignmentFlag.AlignLeading|Qt.TextFlag.TextSingleLine, text) painter.drawText(r, Qt.AlignmentFlag.AlignVCenter|Qt.AlignmentFlag.AlignLeading|Qt.TextFlag.TextSingleLine, text)
if (system != QFontDatabase.WritingSystem.Any): if (system != QFontDatabase.WritingSystem.Any):
w = painter.fontMetrics().width(text + " ") w = painter.fontMetrics().horizontalAdvance(text + " ")
painter.setFont(font2) painter.setFont(font2)
sample = QFontDatabase.writingSystemSample(system) sample = QFontDatabase.writingSystemSample(system)
if (option.direction == Qt.LayoutDirection.RightToLeft): if (option.direction == Qt.LayoutDirection.RightToLeft):