From bd354daa0e4a94d3dcd14d341029e5b70637080e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 21 Nov 2021 18:37:25 +0530 Subject: [PATCH] A couple more QFontMetrics::width --- src/calibre/gui2/dialogs/template_dialog_code_widget.py | 5 ++--- src/calibre/gui2/font_family_chooser.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/dialogs/template_dialog_code_widget.py b/src/calibre/gui2/dialogs/template_dialog_code_widget.py index 407857ba65..c297b98bb4 100644 --- a/src/calibre/gui2/dialogs/template_dialog_code_widget.py +++ b/src/calibre/gui2/dialogs/template_dialog_code_widget.py @@ -61,8 +61,8 @@ class CodeEditor(QPlainTextEdit): def line_number_area_width(self): # get largest width of digits - w = self.fontMetrics() - self.number_width = max(map(lambda x:w.width(str(x)), range(10))) + fm = self.fontMetrics() + self.number_width = max(map(lambda x:fm.horizontalAdvance(str(x)), range(10))) digits = 1 limit = max(1, self.blockCount()) while limit >= 10: @@ -218,4 +218,3 @@ class CodeEditor(QPlainTextEdit): ev.accept() return QPlainTextEdit.keyPressEvent(self, ev) - diff --git a/src/calibre/gui2/font_family_chooser.py b/src/calibre/gui2/font_family_chooser.py index b4849c44a2..26b88508ea 100644 --- a/src/calibre/gui2/font_family_chooser.py +++ b/src/calibre/gui2/font_family_chooser.py @@ -138,7 +138,7 @@ class FontFamilyDelegate(QStyledItemDelegate): painter.drawText(r, Qt.AlignmentFlag.AlignVCenter|Qt.AlignmentFlag.AlignLeading|Qt.TextFlag.TextSingleLine, text) if (system != QFontDatabase.WritingSystem.Any): - w = painter.fontMetrics().width(text + " ") + w = painter.fontMetrics().horizontalAdvance(text + " ") painter.setFont(font2) sample = QFontDatabase.writingSystemSample(system) if (option.direction == Qt.LayoutDirection.RightToLeft):