From 052af8c646b0ea388c9d3ceb25175a397aec6f6f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 9 Sep 2020 14:30:24 +0530 Subject: [PATCH] Remove no longer needed workaround --- src/calibre/gui2/complete2.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/calibre/gui2/complete2.py b/src/calibre/gui2/complete2.py index 81b5e1cbe2..7291f7e22d 100644 --- a/src/calibre/gui2/complete2.py +++ b/src/calibre/gui2/complete2.py @@ -8,14 +8,14 @@ __docformat__ = 'restructuredtext en' from PyQt5.Qt import ( QLineEdit, QAbstractListModel, Qt, pyqtSignal, QObject, QKeySequence, - QApplication, QListView, QPoint, QModelIndex, QFont, QFontInfo, + QApplication, QListView, QPoint, QModelIndex, QStyleOptionComboBox, QStyle, QComboBox, QTimer) try: from PyQt5 import sip except ImportError: import sip -from calibre.constants import isosx, get_osx_version +from calibre.constants import isosx from calibre.utils.icu import sort_key, primary_startswith, primary_contains from calibre.gui2.widgets import EnComboBox, LineEditECM from calibre.utils.config import tweaks @@ -176,14 +176,6 @@ class Completer(QListView): # {{{ self.setCurrentIndex(self.model().index(0)) if not p.isVisible(): - if isosx and get_osx_version() >= (10, 9, 0): - # On mavericks the popup menu seems to use a font smaller than - # the widgets font, see for example: - # https://bugs.launchpad.net/bugs/1243761 - fp = QFontInfo(widget.font()) - f = QFont() - f.setPixelSize(fp.pixelSize()) - self.setFont(f) p.show() def debug_event(self, ev):