ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1559 from pijyoi/pyqt6_evbug

Browse Source 
restrict PyQt6 QEvent.type() monkey patching to 6.0.0
This commit is contained in:
Ogi Moore 2021-02-08 22:44:50 -08:00 committed by GitHub
commit ade6a844e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pyqtgraph/Qt.py
View File

@ -387,10 +387,7 @@ if QT_LIB == PYQT6:
# PyQt6 6.0.0 has a bug where it can't handle certain Type values returned # PyQt6 6.0.0 has a bug where it can't handle certain Type values returned
# by the Qt library. # by the Qt library.
try: if QtCore.PYQT_VERSION == 0x60000:
# 213 is a known failing value
QtCore.QEvent.Type(213)
except ValueError:
def new_method(self, old_method=QtCore.QEvent.type): def new_method(self, old_method=QtCore.QEvent.type):
try: try:
typ = old_method(self) typ = old_method(self)

6
pyqtgraph/widgets/SpinBox.py
View File

@ -113,12 +113,6 @@ class SpinBox(QtGui.QAbstractSpinBox):
self.editingFinished.connect(self.editingFinishedEvent) self.editingFinished.connect(self.editingFinishedEvent)
def event(self, ev):
ret = super().event(ev)
if ev.type() == QtCore.QEvent.KeyPress and ev.key() == QtCore.Qt.Key_Return:
ret = True ## For some reason, spinbox pretends to ignore return key press
return ret
def setOpts(self, **opts): def setOpts(self, **opts):
"""Set options affecting the behavior of the SpinBox. """Set options affecting the behavior of the SpinBox.