Commit4a8d4c7

authored

Merge pull request#21269 from anntzer/pixeldelta

Don't use pixelDelta() on X11.

2 parents22bf7d6 +6d0c9a8 commit4a8d4c7Copy full SHA for 4a8d4c7

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -312,8 +312,10 @@ def mouseReleaseEvent(self, event):`
`312`	`312`
`313`	`313`	`defwheelEvent(self,event):`
`314`	`314`	`x,y=self.mouseEventCoords(self._get_position(event))`
`315`		`-# from QWheelEvent::delta doc`
`316`		`-ifevent.pixelDelta().x()==0andevent.pixelDelta().y()==0:`
	`315`	`+# from QWheelEvent::pixelDelta doc: pixelDelta is sometimes not`
	`316`	+# provided (`isNull()`) and is unreliable on X11 ("xcb").
	`317`	`+if (event.pixelDelta().isNull()`
	`318`	`+orQtWidgets.QApplication.instance().platformName()=="xcb"):`
`317`	`319`	`steps=event.angleDelta().y()/120`
`318`	`320`	`else:`
`319`	`321`	`steps=event.pixelDelta().y()`

Comments

(0)