Mercurial Repositories > eric / file diff

--- a/eric7/Snapshot/SnapshotRegionGrabber.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Snapshot/SnapshotRegionGrabber.py	Sun May 16 20:07:24 2021 +0200
@@ -7,12 +7,12 @@
 Module implementing a grabber widget for a rectangular 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, QPaintEngine, QPen, QBrush,
     QGuiApplication, QCursor
 )
-from PyQt5.QtWidgets import QWidget, QToolTip
+from PyQt6.QtWidgets import QWidget, QToolTip
 
 import Globals
 
@@ -286,12 +286,12 @@
         
         @param evt mouse press event (QMouseEvent)
         """
-        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 = QRect(self.__selection)
-            if not self.__selection.contains(evt.pos()):
+            if not self.__selection.contains(evt.position().toPoint()):
                 self.__newSelection = True
                 self.__selection = QRect()
             else:
@@ -308,14 +308,14 @@
         
         @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()
                 r = self.rect()
                 self.__selection = self.__normalizeSelection(
                     QRect(self.__dragStartPoint,
@@ -324,7 +324,7 @@
                 # moving the whole selection
                 r = self.rect().normalized()
                 s = self.__selectionBeforeDrag.normalized()
-                p = s.topLeft() + evt.pos() - self.__dragStartPoint
+                p = s.topLeft() + evt.position().toPoint() - self.__dragStartPoint
                 r.setBottomRight(
                     r.bottomRight() - QPoint(s.width(), s.height()) +
                     QPoint(1, 1))
@@ -333,7 +333,7 @@
             else:
                 # dragging a handle
                 r = QRect(self.__selectionBeforeDrag)
-                offset = evt.pos() - self.__dragStartPoint
+                offset = evt.position().toPoint() - self.__dragStartPoint
                 
                 if self.__mouseOverHandle in [
                         self.__TLHandle, self.__THandle, self.__TRHandle]:
@@ -363,14 +363,14 @@
             
             found = False
             for r in self.__handles:
-                if r.contains(evt.pos()):
+                if r.contains(evt.position().toPoint()):
                     self.__mouseOverHandle = r
                     found = True
                     break
             
             if not found:
                 self.__mouseOverHandle = None
-                if self.__selection.contains(evt.pos()):
+                if self.__selection.contains(evt.position().toPoint()):
                     self.setCursor(Qt.CursorShape.OpenHandCursor)
                 else:
                     self.setCursor(Qt.CursorShape.CrossCursor)
@@ -398,7 +398,7 @@
         self.__newSelection = False
         if (
             self.__mouseOverHandle is None and
-            self.__selection.contains(evt.pos())
+            self.__selection.contains(evt.position().toPoint())
         ):
             self.setCursor(Qt.CursorShape.OpenHandCursor)
         self.update()