Merge pull request #7610 from QuLogic/qt5-sizing

tacaswell · web-flow · commit 163cf6638be8 · 2016-12-17T11:08:01.000-05:00
FIX: Force Qt5 toolbar minimum height to 48.
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -611,7 +611,15 @@ def _init_toolbar(self):
         if is_pyqt5():
             self.setIconSize(QtCore.QSize(24, 24))
             self.layout().setSpacing(12)
-            self.setMinimumHeight(48)
+
+    if is_pyqt5():
+        # For some reason, self.setMinimumHeight doesn't seem to carry over to
+        # the actual sizeHint, so override it instead in order to make the
+        # aesthetic adjustments noted above.
+        def sizeHint(self):
+            size = super().sizeHint()
+            size.setHeight(max(48, size.height()))
+            return size
 
     def edit_parameters(self):
         allaxes = self.canvas.figure.get_axes()
