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

macOS: Fix completer widget mouse interactions not working with Qt 5.15.0

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

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

@ -6,8 +6,6 @@ __license__ = 'GPL v3'
__copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import weakref
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, QFont, QFontInfo,
@ -86,9 +84,8 @@ class Completer(QListView): # {{{
relayout_needed = pyqtSignal() relayout_needed = pyqtSignal()
def __init__(self, completer_widget, max_visible_items=7, sort_func=sort_key, strip_completion_entries=True): def __init__(self, completer_widget, max_visible_items=7, sort_func=sort_key, strip_completion_entries=True):
QListView.__init__(self) QListView.__init__(self, completer_widget)
self.disable_popup = False self.disable_popup = False
self.completer_widget = weakref.ref(completer_widget)
self.setWindowFlags(Qt.Popup) self.setWindowFlags(Qt.Popup)
self.max_visible_items = max_visible_items self.max_visible_items = max_visible_items
self.setEditTriggers(self.NoEditTriggers) self.setEditTriggers(self.NoEditTriggers)
@ -145,7 +142,7 @@ class Completer(QListView): # {{{
return return
p = self p = self
m = p.model() m = p.model()
widget = self.completer_widget() widget = self.parent()
if widget is None: if widget is None:
return return
screen = QApplication.desktop().availableGeometry(widget) screen = QApplication.desktop().availableGeometry(widget)
@ -205,7 +202,7 @@ class Completer(QListView): # {{{
def eventFilter(self, obj, e): def eventFilter(self, obj, e):
'Redirect key presses from the popup to the widget' 'Redirect key presses from the popup to the widget'
widget = self.completer_widget() widget = self.parent()
if widget is None or sip.isdeleted(widget): if widget is None or sip.isdeleted(widget):
return False return False
etype = e.type() etype = e.type()