Merge pull request #15224 from anntzer/qtactions

dstansby · web-flow · commit 94f84214efcf · 2019-09-09T12:14:34.000+01:00
Avoid infinite loop when switching actions in qt backend.
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -678,8 +678,6 @@ def _icon(self, name, color=None):
 
     def _init_toolbar(self):
         self.basedir = str(cbook._get_data_path('images'))
-        # Ensure that zoom and pan are mutually exclusive.
-        self._button_group = QtWidgets.QButtonGroup()
 
         background_color = self.palette().color(self.backgroundRole())
         foreground_color = self.palette().color(self.foregroundRole())
@@ -695,7 +693,6 @@ def _init_toolbar(self):
                 self._actions[callback] = a
                 if callback in ['zoom', 'pan']:
                     a.setCheckable(True)
-                    self._button_group.addButton(self.widgetForAction(a))
                 if tooltip_text is not None:
                     a.setToolTip(tooltip_text)
                 if text == 'Subplots':
@@ -754,13 +751,20 @@ def edit_parameters(self):
             ax = axes[titles.index(item)]
         figureoptions.figure_edit(ax, self)
 
+    def _update_buttons_checked(self):
+        # sync button checkstates to match active mode
+        if 'pan' in self._actions:
+            self._actions['pan'].setChecked(self._active == 'PAN')
+        if 'zoom' in self._actions:
+            self._actions['zoom'].setChecked(self._active == 'ZOOM')
+
     def pan(self, *args):
         super().pan(*args)
-        self._actions['pan'].setChecked(self._active == 'PAN')
+        self._update_buttons_checked()
 
     def zoom(self, *args):
         super().zoom(*args)
-        self._actions['zoom'].setChecked(self._active == 'ZOOM')
+        self._update_buttons_checked()
 
     def set_message(self, s):
         self.message.emit(s)
