Mercurial Repositories > eric / file diff

--- a/eric7/Snapshot/SnapshotFreehandGrabber.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Snapshot/SnapshotFreehandGrabber.py	Sun May 16 20:07:24 2021 +0200
@@ -7,12 +7,12 @@
 Module implementing a grabber widget for a freehand snapshot region.
 """
 
-from PyQt5.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, QLocale
-from PyQt5.QtGui import (
+from PyQt6.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, QLocale
+from PyQt6.QtGui import (
     QPixmap, QColor, QRegion, QPainter, QPalette, QPolygon, QPen, QBrush,
     QPaintEngine, QGuiApplication, QCursor
 )
-from PyQt5.QtWidgets import QWidget, QToolTip
+from PyQt6.QtWidgets import QWidget, QToolTip
 
 import Globals
 
@@ -252,14 +252,14 @@
         
         @param evt mouse press event (QMouseEvent)
         """
-        self.__pBefore = evt.pos()
+        self.__pBefore = evt.position().toPoint()
         
-        self.__showHelp = not self.__helpTextRect.contains(evt.pos())
+        self.__showHelp = not self.__helpTextRect.contains(evt.position().toPoint())
         if evt.button() == Qt.MouseButton.LeftButton:
             self.__mouseDown = True
-            self.__dragStartPoint = evt.pos()
+            self.__dragStartPoint = evt.position().toPoint()
             self.__selectionBeforeDrag = QPolygon(self.__selection)
-            if not self.__selection.containsPoint(evt.pos(),
+            if not self.__selection.containsPoint(evt.position().toPoint(),
                                                   Qt.FillRule.WindingFill):
                 self.__newSelection = True
                 self.__selection = QPolygon()
@@ -277,19 +277,19 @@
         
         @param evt mouse move event (QMouseEvent)
         """
-        shouldShowHelp = not self.__helpTextRect.contains(evt.pos())
+        shouldShowHelp = not self.__helpTextRect.contains(evt.position().toPoint())
         if shouldShowHelp != self.__showHelp:
             self.__showHelp = shouldShowHelp
             self.update()
         
         if self.__mouseDown:
             if self.__newSelection:
-                p = evt.pos()
+                p = evt.position().toPoint()
                 self.__selection.append(p)
             else:
                 # moving the whole selection
-                p = evt.pos() - self.__pBefore  # Offset
-                self.__pBefore = evt.pos()  # save position for next iteration
+                p = evt.position().toPoint() - self.__pBefore  # Offset
+                self.__pBefore = evt.position().toPoint()  # save position for next iteration
                 self.__selection.translate(p)
             
             self.update()
@@ -297,7 +297,7 @@
             if self.__selection.boundingRect().isEmpty():
                 return
             
-            if self.__selection.containsPoint(evt.pos(),
+            if self.__selection.containsPoint(evt.position().toPoint(),
                                               Qt.FillRule.WindingFill):
                 self.setCursor(Qt.CursorShape.OpenHandCursor)
             else:
@@ -311,7 +311,7 @@
         """
         self.__mouseDown = False
         self.__newSelection = False
-        if self.__selection.containsPoint(evt.pos(), Qt.FillRule.WindingFill):
+        if self.__selection.containsPoint(evt.position().toPoint(), Qt.FillRule.WindingFill):
             self.setCursor(Qt.CursorShape.OpenHandCursor)
         self.update()