MNT: tweak the toolbar for Qt

tacaswell · tacaswell · commit cedaaae0f3ca · 2017-04-07T20:29:00.000-04:00
Do not over-size the icons
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -592,7 +592,9 @@ def __init__(self, canvas, parent, coordinates=True):
     def _icon(self, name):
         if is_pyqt5():
             name = name.replace('.png', '_large.png')
-        return QtGui.QIcon(os.path.join(self.basedir, name))
+        pm = QtGui.QPixmap(os.path.join(self.basedir, name))
+        pm.setDevicePixelRatio(self.canvas._dpi_ratio)
+        return QtGui.QIcon(pm)
 
     def _init_toolbar(self):
         self.basedir = os.path.join(matplotlib.rcParams['datapath'], 'images')
@@ -602,7 +604,7 @@ def _init_toolbar(self):
                 self.addSeparator()
             else:
                 a = self.addAction(self._icon(image_file + '.png'),
-                                         text, getattr(self, callback))
+                                   text, getattr(self, callback))
                 self._actions[callback] = a
                 if callback in ['zoom', 'pan']:
                     a.setCheckable(True)
@@ -624,29 +626,13 @@ def _init_toolbar(self):
                     QtCore.Qt.AlignRight | QtCore.Qt.AlignTop)
             self.locLabel.setSizePolicy(
                 QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding,
-                                  QtWidgets.QSizePolicy.Ignored))
+                                      QtWidgets.QSizePolicy.Ignored))
             labelAction = self.addWidget(self.locLabel)
             labelAction.setVisible(True)
 
         # reference holder for subplots_adjust window
         self.adj_window = None
 
-        # Esthetic adjustments - we need to set these explicitly in PyQt5
-        # otherwise the layout looks different - but we don't want to set it if
-        # not using HiDPI icons otherwise they look worse than before.
-        if is_pyqt5():
-            self.setIconSize(QtCore.QSize(24, 24))
-            self.layout().setSpacing(12)
-
-    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(NavigationToolbar2QT, self).sizeHint()
-            size.setHeight(max(48, size.height()))
-            return size
-
     def edit_parameters(self):
         allaxes = self.canvas.figure.get_axes()
         if not allaxes:
