fix localPos() deprecated warnings
This commit is contained in:
parent
60661f586f
commit
70c123a95c
@ -198,7 +198,7 @@ class Dock(QtGui.QWidget, DockDrop):
|
|||||||
self.drag.setMimeData(mime)
|
self.drag.setMimeData(mime)
|
||||||
self.widgetArea.setStyleSheet(self.dragStyle)
|
self.widgetArea.setStyleSheet(self.dragStyle)
|
||||||
self.update()
|
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()
|
self.updateStyle()
|
||||||
|
|
||||||
def float(self):
|
def float(self):
|
||||||
@ -329,13 +329,15 @@ class DockLabel(VerticalLabel):
|
|||||||
self.updateStyle()
|
self.updateStyle()
|
||||||
|
|
||||||
def mousePressEvent(self, ev):
|
def mousePressEvent(self, ev):
|
||||||
self.pressPos = ev.localPos()
|
lpos = ev.position() if hasattr(ev, 'position') else ev.localPos()
|
||||||
|
self.pressPos = lpos
|
||||||
self.mouseMoved = False
|
self.mouseMoved = False
|
||||||
ev.accept()
|
ev.accept()
|
||||||
|
|
||||||
def mouseMoveEvent(self, ev):
|
def mouseMoveEvent(self, ev):
|
||||||
if not self.mouseMoved:
|
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:
|
if self.mouseMoved and ev.buttons() == QtCore.Qt.LeftButton:
|
||||||
self.dock.startDrag()
|
self.dock.startDrag()
|
||||||
|
@ -343,7 +343,7 @@ class GraphicsView(QtGui.QGraphicsView):
|
|||||||
|
|
||||||
if not self.mouseEnabled:
|
if not self.mouseEnabled:
|
||||||
return
|
return
|
||||||
lpos = ev.localPos()
|
lpos = ev.position() if hasattr(ev, 'position') else ev.localPos()
|
||||||
self.lastMousePos = lpos
|
self.lastMousePos = lpos
|
||||||
self.mousePressPos = lpos
|
self.mousePressPos = lpos
|
||||||
self.clickAccepted = ev.isAccepted()
|
self.clickAccepted = ev.isAccepted()
|
||||||
@ -360,7 +360,7 @@ class GraphicsView(QtGui.QGraphicsView):
|
|||||||
return ## Everything below disabled for now..
|
return ## Everything below disabled for now..
|
||||||
|
|
||||||
def mouseMoveEvent(self, ev):
|
def mouseMoveEvent(self, ev):
|
||||||
lpos = ev.localPos()
|
lpos = ev.position() if hasattr(ev, 'position') else ev.localPos()
|
||||||
if self.lastMousePos is None:
|
if self.lastMousePos is None:
|
||||||
self.lastMousePos = lpos
|
self.lastMousePos = lpos
|
||||||
delta = Point(lpos - self.lastMousePos)
|
delta = Point(lpos - self.lastMousePos)
|
||||||
|
@ -19,11 +19,13 @@ class JoystickButton(QtGui.QPushButton):
|
|||||||
|
|
||||||
def mousePressEvent(self, ev):
|
def mousePressEvent(self, ev):
|
||||||
self.setChecked(True)
|
self.setChecked(True)
|
||||||
self.pressPos = ev.localPos()
|
lpos = ev.position() if hasattr(ev, 'position') else ev.localPos()
|
||||||
|
self.pressPos = lpos
|
||||||
ev.accept()
|
ev.accept()
|
||||||
|
|
||||||
def mouseMoveEvent(self, ev):
|
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())
|
self.setState(dif.x(), -dif.y())
|
||||||
|
|
||||||
def mouseReleaseEvent(self, ev):
|
def mouseReleaseEvent(self, ev):
|
||||||
|
Loading…
Reference in New Issue
Block a user