Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Bugfix Tk start_event_loop #19959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 2, 2021
Merged

Bugfix Tk start_event_loop #19959

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af9e3e2
handle timeouts less than 1 millisecond
richardsheridan Apr 14, 2021
dc093a5
cancel timeout if manually stopped
richardsheridan Apr 14, 2021
b92ecda
respect timeout==0 -> no timeout
richardsheridan Apr 14, 2021
41bb1d4
extra defensive delay to prevent race with draw_idle
richardsheridan Apr 14, 2021
9418774
linting
richardsheridan Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions lib/matplotlib/backends/_backend_tk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ def __init__(self, figure=None, master=None, resize_callback=None):
super().__init__(figure)
self._idle = True
self._idle_callback = None
self._event_loop_id = None
w, h = self.figure.bbox.size.astype(int)
self._tkcanvas = tk.Canvas(
master=master, background="white",
Expand Down Expand Up @@ -359,11 +360,20 @@ def flush_events(self):
def start_event_loop(self, timeout=0):
# docstring inherited
if timeout > 0:
self._master.after(int(1000*timeout), self.stop_event_loop)
milliseconds = int(1000 * timeout)
if milliseconds > 0:
self._event_loop_id = self._tkcanvas.after(
milliseconds, self.stop_event_loop)
else:
self._event_loop_id = self._tkcanvas.after_idle(
self.stop_event_loop)
self._master.mainloop()

def stop_event_loop(self):
# docstring inherited
if self._event_loop_id:
self._master.after_cancel(self._event_loop_id)
self._event_loop_id = None
self._master.quit()


Expand Down Expand Up @@ -439,6 +449,8 @@ def destroy(*args):
def destroy(self, *args):
if self.canvas._idle_callback:
self.canvas._tkcanvas.after_cancel(self.canvas._idle_callback)
if self.canvas._event_loop_id:
self.canvas._tkcanvas.after_cancel(self.canvas._event_loop_id)

# NOTE: events need to be flushed before issuing destroy (GH #9956),
# however, self.window.update() can break user code. This is the
Expand All @@ -451,7 +463,8 @@ def delayed_destroy():
if self._owns_mainloop and not Gcf.get_num_fig_managers():
self.window.quit()

self.window.after_idle(delayed_destroy)
# "after idle after 0" avoids Tcl error/race (GH #19940)
self.window.after_idle(self.window.after, 0, delayed_destroy)

def get_window_title(self):
return self.window.wm_title()
Expand Down