@@ -166,7 +166,7 @@ class FigureCanvasTk(FigureCanvasBase):
166166 def __init__ (self , figure = None , master = None , resize_callback = None ):
167167 super ().__init__ (figure )
168168 self ._idle_draw_id = None
169- w , h = self .figure . bbox . size . astype ( int )
169+ w , h = self .get_width_height ( physical = True )
170170 self ._tkcanvas = tk .Canvas (
171171 master = master , background = "white" ,
172172 width = w , height = h , borderwidth = 0 , highlightthickness = 0 )
@@ -175,6 +175,7 @@ def __init__(self, figure=None, master=None, resize_callback=None):
175175 self ._tkcanvas .create_image (w // 2 , h // 2 , image = self ._tkphoto )
176176 self ._resize_callback = resize_callback
177177 self ._tkcanvas .bind ("<Configure>" , self .resize )
178+ self ._tkcanvas .bind ("<Map>" , self ._update_device_pixel_ratio )
178179 self ._tkcanvas .bind ("<Key>" , self .key_press )
179180 self ._tkcanvas .bind ("<Motion>" , self .motion_notify_event )
180181 self ._tkcanvas .bind ("<Enter>" , self .enter_notify_event )
@@ -209,6 +210,18 @@ def filter_destroy(event):
209210 self ._master = master
210211 self ._tkcanvas .focus_set ()
211212
213+ def _update_device_pixel_ratio (self , event = None ):
214+ # Tk gives scaling with respect to 72 DPI, but most (all?) screens are
215+ # scaled vs 96 dpi, and pixel ratio settings are given in whole
216+ # percentages, so round to 2 digits.
217+ ratio = round (self ._master .call ('tk' , 'scaling' ) / (96 / 72 ), 2 )
218+ if self ._set_device_pixel_ratio (ratio ):
219+ # The easiest way to resize the canvas is to resize the canvas
220+ # widget itself, since we implement all the logic for resizing the
221+ # canvas backing store on that event.
222+ w , h = self .get_width_height (physical = True )
223+ self ._tkcanvas .configure (width = w , height = h )
224+
212225 def resize (self , event ):
213226 width , height = event .width , event .height
214227 if self ._resize_callback is not None :
0 commit comments