Skip to content

Backport PR #23729 on branch v3.6.x (Use cleaner recursion check in PyQt FigureCanvas' resizeEvent.) #23732

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 1 commit into from
Aug 25, 2022
Merged

Backport PR #23729 on branch v3.6.x (Use cleaner recursion check in PyQt FigureCanvas' resizeEvent.) #23732

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 17 additions & 14 deletions lib/matplotlib/backends/backend_qt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ def __init__(self, figure=None):
self._draw_pending = False
self._is_drawing = False
self._draw_rect_callback = lambda painter: None
self._in_resize_event = False

self.setAttribute(
_enum("QtCore.Qt.WidgetAttribute").WA_OpaquePaintEvent)
Expand Down Expand Up @@ -333,21 +334,23 @@ def keyReleaseEvent(self, event):
guiEvent=event)._process()

def resizeEvent(self, event):
frame = sys._getframe()
# Prevent PyQt6 recursion, but sometimes frame.f_back is None
if frame.f_code is getattr(frame.f_back, 'f_code', None):
if self._in_resize_event: # Prevent PyQt6 recursion
return
w = event.size().width() * self.device_pixel_ratio
h = event.size().height() * self.device_pixel_ratio
dpival = self.figure.dpi
winch = w / dpival
hinch = h / dpival
self.figure.set_size_inches(winch, hinch, forward=False)
# pass back into Qt to let it finish
QtWidgets.QWidget.resizeEvent(self, event)
# emit our resize events
ResizeEvent("resize_event", self)._process()
self.draw_idle()
self._in_resize_event = True
try:
w = event.size().width() * self.device_pixel_ratio
h = event.size().height() * self.device_pixel_ratio
dpival = self.figure.dpi
winch = w / dpival
hinch = h / dpival
self.figure.set_size_inches(winch, hinch, forward=False)
# pass back into Qt to let it finish
QtWidgets.QWidget.resizeEvent(self, event)
# emit our resize events
ResizeEvent("resize_event", self)._process()
self.draw_idle()
finally:
self._in_resize_event = False

def sizeHint(self):
w, h = self.get_width_height()
Expand Down