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

Remove no longer needed workaround

Browse Source
This commit is contained in:
Kovid Goyal 2020-09-09 14:30:24 +05:30
parent 7fad774a75
commit 052af8c646
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/complete2.py
View File

@ -8,14 +8,14 @@ __docformat__ = 'restructuredtext en'
from PyQt5.Qt import ( from PyQt5.Qt import (
QLineEdit, QAbstractListModel, Qt, pyqtSignal, QObject, QKeySequence, QLineEdit, QAbstractListModel, Qt, pyqtSignal, QObject, QKeySequence,
QApplication, QListView, QPoint, QModelIndex, QFont, QFontInfo, QApplication, QListView, QPoint, QModelIndex,
QStyleOptionComboBox, QStyle, QComboBox, QTimer) QStyleOptionComboBox, QStyle, QComboBox, QTimer)
try: try:
from PyQt5 import sip from PyQt5 import sip
except ImportError: except ImportError:
import sip 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.utils.icu import sort_key, primary_startswith, primary_contains
from calibre.gui2.widgets import EnComboBox, LineEditECM from calibre.gui2.widgets import EnComboBox, LineEditECM
from calibre.utils.config import tweaks from calibre.utils.config import tweaks
@ -176,14 +176,6 @@ class Completer(QListView): # {{{
self.setCurrentIndex(self.model().index(0)) self.setCurrentIndex(self.model().index(0))
if not p.isVisible(): 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() p.show()
def debug_event(self, ev): def debug_event(self, ev):