Commit3b50d5c

authored and

committed

Backport PR#29907: Ensure text metric calculation always uses the text cache

1 parentacb7361 commit3b50d5cCopy full SHA for 3b50d5c

File tree

+11

-9

lines changed

+11

-9

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -794,9 +794,10 @@ def get_offset(self):`
`794`	`794`	`returnself._offset`
`795`	`795`
`796`	`796`	`defget_bbox(self,renderer):`
`797`		`-_,h_,d_=renderer.get_text_width_height_descent(`
`798`		`-"lp",self._text._fontproperties,`
`799`		`-ismath="TeX"ifself._text.get_usetex()elseFalse)`
	`797`	`+_,h_,d_=mtext._get_text_metrics_with_cache(`
	`798`	`+renderer,"lp",self._text._fontproperties,`
	`799`	`+ismath="TeX"ifself._text.get_usetex()elseFalse,`
	`800`	`+dpi=self.get_figure(root=True).dpi)`
`800`	`801`
`801`	`802`	`bbox,info,yd=self._text._get_layout(renderer)`
`802`	`803`	`w,h=bbox.size`

7.41 KB

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -678,10 +678,10 @@ def _get_rendered_text_width(self, text):`
`678`	`678`	`Return the width of a given text string, in pixels.`
`679`	`679`	`"""`
`680`	`680`
`681`		`-w,h,d=self._renderer.get_text_width_height_descent(`
`682`		`-text,`
`683`		`-self.get_fontproperties(),`
`684`		`-cbook.is_math_text(text))`
	`681`	`+w,h,d=_get_text_metrics_with_cache(`
	`682`	`+self._renderer,text,self.get_fontproperties(),`
	`683`	`+cbook.is_math_text(text),`
	`684`	`+self.get_figure(root=True).dpi)`
`685`	`685`	`returnmath.ceil(w)`
`686`	`686`
`687`	`687`	`def_get_wrapped_text(self):`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -588,8 +588,9 @@ def get_texts_widths_heights_descents(self, renderer):`
`588`	`588`	`ifnotlabel.strip():`
`589`	`589`	`continue`
`590`	`590`	`clean_line,ismath=self._preprocess_math(label)`
`591`		`-whd=renderer.get_text_width_height_descent(`
`592`		`-clean_line,self._fontproperties,ismath=ismath)`
	`591`	`+whd=mtext._get_text_metrics_with_cache(`
	`592`	`+renderer,clean_line,self._fontproperties,ismath=ismath,`
	`593`	`+dpi=self.get_figure(root=True).dpi)`
`593`	`594`	`whd_list.append(whd)`
`594`	`595`	`returnwhd_list`
`595`	`596`

Comments

(0)