Skip to content

Add support for HiDPI in TkAgg on Windows #19167

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
tacaswell merged 7 commits into from
May 14, 2021
Merged

Add support for HiDPI in TkAgg on Windows #19167

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de4526a
tk: Make toolbar sizes DPI-independent.
QuLogic Nov 5, 2020
3802778
Shorten Tk idle handling.
QuLogic Nov 13, 2020
497fd23
Support returning physical size of the canvas.
QuLogic Dec 23, 2020
c06cc86
Add initial support for HiDPI in TkAgg on Windows.
QuLogic Dec 23, 2020
d4422a2
tk: Use a common Font object for toolbar labels.
QuLogic Apr 21, 2021
559c095
Set Windows DPI awareness to best possible setting.
QuLogic Apr 22, 2021
741ee02
Handle DPI changes in TkAgg backend on Windows.
QuLogic Apr 23, 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
Prev Previous commit
Next Next commit
Shorten Tk idle handling. 
Also, rename variable to match GTK3 backend.
  • Loading branch information
@QuLogic
QuLogic committed May 11, 2021
commit 3802778e879fb36de2e75b9f1394887ed91cbffa
15 changes: 6 additions & 9 deletions lib/matplotlib/backends/_backend_tk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,7 @@ class FigureCanvasTk(FigureCanvasBase):
alternative="get_tk_widget().bind('<Configure>', ..., True)")
def __init__(self, figure=None, master=None, resize_callback=None):
super().__init__(figure)
self._idle = True
self._idle_callback = None
self._idle_draw_id = None
self._event_loop_id = None
w, h = self.figure.bbox.size.astype(int)
self._tkcanvas = tk.Canvas(
Expand Down Expand Up @@ -231,18 +230,16 @@ def resize(self, event):

def draw_idle(self):
# docstring inherited
if not self._idle:
if self._idle_draw_id:
return

self._idle = False

def idle_draw(*args):
try:
self.draw()
finally:
self._idle = True
self._idle_draw_id = None

self._idle_callback = self._tkcanvas.after_idle(idle_draw)
self._idle_draw_id = self._tkcanvas.after_idle(idle_draw)

def get_tk_widget(self):
"""
Expand Down Expand Up @@ -448,8 +445,8 @@ def destroy(*args):
self._shown = True

def destroy(self, *args):
if self.canvas._idle_callback:
self.canvas._tkcanvas.after_cancel(self.canvas._idle_callback)
if self.canvas._idle_draw_id:
self.canvas._tkcanvas.after_cancel(self.canvas._idle_draw_id)
if self.canvas._event_loop_id:
self.canvas._tkcanvas.after_cancel(self.canvas._event_loop_id)

Expand Down