Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Inline AnchoredOffsetBox._update_offset_func. #23896

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.

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 1 commit into from
Sep 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 9 additions & 19 deletions 28 lib/matplotlib/offsetbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -1066,29 +1066,21 @@ def get_window_extent(self, renderer=None):
if renderer is None:
renderer = self.figure._get_renderer()

self._update_offset_func(renderer)
w, h, xd, yd = self.get_extent(renderer)
ox, oy = self.get_offset(w, h, xd, yd, renderer)
return Bbox.from_bounds(ox - xd, oy - yd, w, h)

def _update_offset_func(self, renderer, fontsize=None):
"""
Update the offset func which depends on the dpi of the
renderer (because of the padding).
"""
if fontsize is None:
fontsize = renderer.points_to_pixels(
self.prop.get_size_in_points())
# Update the offset func, which depends on the dpi of the renderer
# (because of the padding).
fontsize = renderer.points_to_pixels(self.prop.get_size_in_points())

def _offset(w, h, xd, yd, renderer):
bbox = Bbox.from_bounds(0, 0, w, h)
borderpad = self.borderpad * fontsize
pad = self.borderpad * fontsize
bbox_to_anchor = self.get_bbox_to_anchor()
x0, y0 = _get_anchored_bbox(
self.loc, bbox, bbox_to_anchor, borderpad)
x0, y0 = _get_anchored_bbox(self.loc, bbox, bbox_to_anchor, pad)
return x0 + xd, y0 + yd

self.set_offset(_offset)
w, h, xd, yd = self.get_extent(renderer)
ox, oy = self.get_offset(w, h, xd, yd, renderer)
return Bbox.from_bounds(ox - xd, oy - yd, w, h)

def update_frame(self, bbox, fontsize=None):
self.patch.set_bounds(bbox.bounds)
Expand All @@ -1100,11 +1092,9 @@ def draw(self, renderer):
if not self.get_visible():
return

fontsize = renderer.points_to_pixels(self.prop.get_size_in_points())
self._update_offset_func(renderer, fontsize)

# update the location and size of the legend
bbox = self.get_window_extent(renderer)
fontsize = renderer.points_to_pixels(self.prop.get_size_in_points())
self.update_frame(bbox, fontsize)
self.patch.draw(renderer)

Expand Down
15 changes: 4 additions & 11 deletions 15 lib/mpl_toolkits/axes_grid1/inset_locator.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,11 @@ def draw(self, renderer):

def __call__(self, ax, renderer):
self.axes = ax

fontsize = renderer.points_to_pixels(self.prop.get_size_in_points())
self._update_offset_func(renderer, fontsize)

width, height, xdescent, ydescent = self.get_extent(renderer)

px, py = self.get_offset(width, height, 0, 0, renderer)
bbox_canvas = Bbox.from_bounds(px, py, width, height)
bbox = self.get_window_extent(renderer)
px, py = self.get_offset(bbox.width, bbox.height, 0, 0, renderer)
bbox_canvas = Bbox.from_bounds(px, py, bbox.width, bbox.height)
tr = ax.figure.transFigure.inverted()
bb = TransformedBbox(bbox_canvas, tr)

return bb
return TransformedBbox(bbox_canvas, tr)


class AnchoredSizeLocator(AnchoredLocatorBase):
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.