Merged remote changes. QtWebEngine

Sun, 21 Feb 2016 18:54:48 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 21 Feb 2016 18:54:48 +0100
branch
QtWebEngine
changeset 4762
ea40955a0937
parent 4761
9d077d20be75 (current diff)
parent 4760
d053f6655a0f (diff)
child 4763
8ad353f31184

Merged remote changes.

--- a/WebBrowser/WebBrowserView.py	Sun Feb 21 18:54:14 2016 +0100
+++ b/WebBrowser/WebBrowserView.py	Sun Feb 21 18:54:48 2016 +0100
@@ -1318,18 +1318,18 @@
         super(WebBrowserView, self).focusOutEvent(evt)
     
     # TODO: Gestures: Obsoleted by eventFilter() (?)
-##    def event(self, evt):
-##        """
-##        Public method handling events.
-##        
-##        @param evt reference to the event (QEvent)
-##        @return flag indicating, if the event was handled (boolean)
-##        """
-##        if evt.type() == QEvent.Gesture:
-##            self.gestureEvent(evt)
-##            return True
-##        
-##        return super(WebBrowserView, self).event(evt)
+    def event(self, evt):
+        """
+        Public method handling events.
+        
+        @param evt reference to the event (QEvent)
+        @return flag indicating, if the event was handled (boolean)
+        """
+        if evt.type() == QEvent.Gesture:
+            self._gestureEvent(evt)
+            return True
+        
+        return super(WebBrowserView, self).event(evt)
     
     def _gestureEvent(self, evt):
         """
@@ -1364,6 +1364,7 @@
             if child and child.inherits(
                     "QtWebEngineCore::RenderWidgetHostViewQtDelegateWidget"):
                 self.__rwhvqt = child
+                self.grabGesture(Qt.PinchGesture)
                 self.__rwhvqt.installEventFilter(self)
         
         # forward events to WebBrowserView

eric ide

mercurial