FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Backport PR #23729 on branch v3.6.x (Use cleaner recursion check in PyQt FigureCanvas' resizeEvent.) by meeseeksmachine · Pull Request #23732 · matplotlib/matplotlib · GitHub

Repository navigation

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .py  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
31 changes: 17 additions & 14 deletions lib/matplotlib/backends/backend_qt.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
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

Back | FazBrowse Home | New Git URL