Commit8761e0d

authored

Merge pull request#30101 from meeseeksmachine/auto-backport-of-pr-30096-on-v3.10.x

2 parents9f08b50 +4b8e2a0 commit8761e0dCopy full SHA for 8761e0d

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1506,7 +1506,9 @@ def __init__(self, ref_artist, use_blit=False):`
`1506`	`1506`	`@staticmethod`
`1507`	`1507`	`def_picker(artist,mouseevent):`
`1508`	`1508`	`# A custom picker to prevent dragging on mouse scroll events`
`1509`		`-return (artist.contains(mouseevent)andmouseevent.name!="scroll_event"), {}`
	`1509`	`+ifmouseevent.name=="scroll_event":`
	`1510`	`+returnFalse, {}`
	`1511`	`+returnartist.contains(mouseevent)`
`1510`	`1512`
`1511`	`1513`	`# A property, not an attribute, to maintain picklability.`
`1512`	`1514`	`canvas=property(lambdaself:self.ref_artist.get_figure(root=True).canvas)`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -460,3 +460,13 @@ def test_draggable_in_subfigure():`
`460`	`460`	`fig.canvas.draw()# Texts are non-pickable until the first draw.`
`461`	`461`	`MouseEvent("button_press_event",fig.canvas,1,1)._process()`
`462`	`462`	`assertann._draggable.got_artist`
	`463`	`+# Stop dragging the annotation.`
	`464`	`+MouseEvent("button_release_event",fig.canvas,1,1)._process()`
	`465`	`+assertnotann._draggable.got_artist`
	`466`	`+# A scroll event should not initiate a drag.`
	`467`	`+MouseEvent("scroll_event",fig.canvas,1,1)._process()`
	`468`	`+assertnotann._draggable.got_artist`
	`469`	`+# An event outside the annotation should not initiate a drag.`
	`470`	`+bbox=ann.get_window_extent()`
	`471`	`+MouseEvent("button_press_event",fig.canvas,bbox.x1+2,bbox.y1+2)._process()`
	`472`	`+assertnotann._draggable.got_artist`

Comments

(0)