Commit 5c83d7b

committed

FIX: callbacks do not raise after removal of widget axes

1 parent 5a9f7cb commit 5c83d7bCopy full SHA for 5c83d7b

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,9 @@ def __init__(self, ax):`
`117`	`117`	`self.ax = ax`
`118`	`118`	`self._cids = []`
`119`	`119`
`120`		`- canvas = property(lambda self: self.ax.get_figure(root=True).canvas)`
	`120`	`+ canvas = property(`
	`121`	`+ lambda self: getattr(self.ax.get_figure(root=True), 'canvas', None)`
	`122`	`+ )`
`121`	`123`
`122`	`124`	`def connect_event(self, event, callback):`
`123`	`125`	`"""`
`@@ -144,6 +146,10 @@ def _get_data_coords(self, event):`
`144`	`146`	`return ((event.xdata, event.ydata) if event.inaxes is self.ax`
`145`	`147`	`else self.ax.transData.inverted().transform((event.x, event.y)))`
`146`	`148`
	`149`	`+ def ignore(self, event):`
	`150`	`+ # docstring inherited`
	`151`	`+ return super().ignore(event) or self.canvas is None`
	`152`	`+`
`147`	`153`
`148`	`154`	`class Button(AxesWidget):`
`149`	`155`	`"""`
`@@ -2181,7 +2187,9 @@ def connect_default_events(self):`
`2181`	`2187`
`2182`	`2188`	`def ignore(self, event):`
`2183`	`2189`	`# docstring inherited`
`2184`		`- if not self.active or not self.ax.get_visible():`
	`2190`	`+ if super().ignore(event):`
	`2191`	`+ return True`
	`2192`	`+ if not self.ax.get_visible():`
`2185`	`2193`	`return True`
`2186`	`2194`	`# If canvas was locked`
`2187`	`2195`	`if not self.canvas.widgetlock.available(self):`

Comments

(0)