diff --git a/pyqtgraph/dockarea/Dock.py b/pyqtgraph/dockarea/Dock.py index 7a5e09d4..2c65ece5 100644 --- a/pyqtgraph/dockarea/Dock.py +++ b/pyqtgraph/dockarea/Dock.py @@ -198,7 +198,7 @@ class Dock(QtGui.QWidget, DockDrop): self.drag.setMimeData(mime) self.widgetArea.setStyleSheet(self.dragStyle) self.update() - action = self.drag.exec_() if hasattr(self.drag, 'exec_') else self.drag.exec() + action = self.drag.exec() if hasattr(self.drag, 'exec') else self.drag.exec_() self.updateStyle() def float(self): @@ -329,13 +329,15 @@ class DockLabel(VerticalLabel): self.updateStyle() def mousePressEvent(self, ev): - self.pressPos = ev.localPos() + lpos = ev.position() if hasattr(ev, 'position') else ev.localPos() + self.pressPos = lpos self.mouseMoved = False ev.accept() def mouseMoveEvent(self, ev): if not self.mouseMoved: - self.mouseMoved = (ev.localPos() - self.pressPos).manhattanLength() > QtGui.QApplication.startDragDistance() + lpos = ev.position() if hasattr(ev, 'position') else ev.localPos() + self.mouseMoved = (lpos - self.pressPos).manhattanLength() > QtGui.QApplication.startDragDistance() if self.mouseMoved and ev.buttons() == QtCore.Qt.LeftButton: self.dock.startDrag() diff --git a/pyqtgraph/widgets/GraphicsView.py b/pyqtgraph/widgets/GraphicsView.py index d2b0f553..b0e33eb3 100644 --- a/pyqtgraph/widgets/GraphicsView.py +++ b/pyqtgraph/widgets/GraphicsView.py @@ -343,7 +343,7 @@ class GraphicsView(QtGui.QGraphicsView): if not self.mouseEnabled: return - lpos = ev.localPos() + lpos = ev.position() if hasattr(ev, 'position') else ev.localPos() self.lastMousePos = lpos self.mousePressPos = lpos self.clickAccepted = ev.isAccepted() @@ -360,7 +360,7 @@ class GraphicsView(QtGui.QGraphicsView): return ## Everything below disabled for now.. def mouseMoveEvent(self, ev): - lpos = ev.localPos() + lpos = ev.position() if hasattr(ev, 'position') else ev.localPos() if self.lastMousePos is None: self.lastMousePos = lpos delta = Point(lpos - self.lastMousePos) diff --git a/pyqtgraph/widgets/JoystickButton.py b/pyqtgraph/widgets/JoystickButton.py index 53674df2..6c5d1ae6 100644 --- a/pyqtgraph/widgets/JoystickButton.py +++ b/pyqtgraph/widgets/JoystickButton.py @@ -19,11 +19,13 @@ class JoystickButton(QtGui.QPushButton): def mousePressEvent(self, ev): self.setChecked(True) - self.pressPos = ev.localPos() + lpos = ev.position() if hasattr(ev, 'position') else ev.localPos() + self.pressPos = lpos ev.accept() def mouseMoveEvent(self, ev): - dif = ev.localPos()-self.pressPos + lpos = ev.position() if hasattr(ev, 'position') else ev.localPos() + dif = lpos - self.pressPos self.setState(dif.x(), -dif.y()) def mouseReleaseEvent(self, ev):