eric7/WebBrowser/WebBrowserView.py

branch
eric7
changeset 8582
ae6032e4b4ef
parent 8573
77845f40ebfe
child 8637
394377638256
diff -r a6c893c8b7af -r ae6032e4b4ef eric7/WebBrowser/WebBrowserView.py
--- a/eric7/WebBrowser/WebBrowserView.py	Sun Sep 05 16:30:19 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserView.py	Sun Sep 05 18:07:03 2021 +0200
@@ -585,7 +585,7 @@
         @type WebHitTestResult
         """
         spellCheckActionCount = 0
-        contextMenuData = self.page().contextMenuData()
+        contextMenuData = self.lastContextMenuRequest()
         hitTest.updateWithContextMenuData(contextMenuData)
         
         if bool(contextMenuData.misspelledWord()):
@@ -1160,7 +1160,10 @@
         
         if isinstance(data, QUrl):
             data = data.toString()
-        QApplication.clipboard().setText(data)
+        
+        # copy the URL to both clipboard areas
+        QApplication.clipboard().setText(data, QClipboard.Mode.Clipboard)
+        QApplication.clipboard().setText(data, QClipboard.Mode.Selection)
     
     def __downloadLink(self):
         """
@@ -1385,16 +1388,6 @@
         if WebBrowserWindow.autoScroller().mousePress(self, evt):
             evt.accept()
             return
-        
-        self.__mw.setEventMouseButtons(evt.buttons())
-        self.__mw.setEventKeyboardModifiers(evt.modifiers())
-        
-        if evt.button() == Qt.MouseButton.XButton1:
-            self.pageAction(QWebEnginePage.WebAction.Back).trigger()
-            evt.accept()
-        elif evt.button() == Qt.MouseButton.XButton2:
-            self.pageAction(QWebEnginePage.WebAction.Forward).trigger()
-            evt.accept()
     
     def _mouseReleaseEvent(self, evt):
         """
@@ -1410,7 +1403,7 @@
         self.__page.event(evt)
         if (
             not evt.isAccepted() and
-            self.__mw.eventMouseButtons() & Qt.MouseButton.MiddleButton
+            evt.button() == Qt.MouseButton.MiddleButton
         ):
             url = QUrl(QApplication.clipboard().text(
                 QClipboard.Mode.Selection))
@@ -1419,9 +1412,6 @@
                 url.isValid() and
                 url.scheme() != ""
             ):
-                self.__mw.setEventMouseButtons(Qt.MouseButton.NoButton)
-                self.__mw.setEventKeyboardModifiers(
-                    Qt.KeyboardModifier.NoModifier)
                 self.setSource(url)
         evt.setAccepted(accepted)
     

eric ide

mercurial