WebBrowserView: changed the RenderWidgetHostViewQtDelegateWidget detection logic for 5.12 again.

Sat, 23 Feb 2019 13:05:18 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 23 Feb 2019 13:05:18 +0100
changeset 6797
d9e56b0aa7ac
parent 6796
eebd0a5f10f4
child 6802
864d10ecf3a4
child 6805
10fefa6f331a
child 6809
d1048e6db7f5

WebBrowserView: changed the RenderWidgetHostViewQtDelegateWidget detection logic for 5.12 again.

WebBrowser/WebBrowserView.py file | annotate | diff | comparison | revisions
--- a/WebBrowser/WebBrowserView.py	Sat Feb 23 12:25:39 2019 +0100
+++ b/WebBrowser/WebBrowserView.py	Sat Feb 23 13:05:18 2019 +0100
@@ -1519,8 +1519,8 @@
             self.parentWidget().installEventFilter(self)
         
         # find the render widget receiving events for the web page
-        if qVersionTuple() < (5, 8, 0) or qVersionTuple() >= (5, 12, 0):
-            if obj is self and evt.type() == QEvent.ChildAdded:
+        if obj is self and evt.type() == QEvent.ChildAdded:
+            if qVersionTuple() < (5, 8, 0):
                 child = evt.child()
                 if child and child.inherits(
                         "QtWebEngineCore::"
@@ -1529,8 +1529,7 @@
                     self.grabGesture(Qt.PinchGesture)
                     self.__rwhvqt.grabGesture(Qt.PinchGesture)
                     self.__rwhvqt.installEventFilter(self)
-        elif qVersionTuple() >= (5, 11, 0):
-            if obj is self and evt.type() == QEvent.ChildAdded:
+            elif qVersionTuple() >= (5, 11, 0):
                 QTimer.singleShot(0, self.__setRwhvqt)
         
         # forward events to WebBrowserView

eric ide

mercurial