Merge pull request #14702 from anntzer/qtnavbarhighdpi

tacaswell · web-flow · commit bb6a4af98477 · 2019-08-05T15:51:28.000-04:00
MNT: Don't enlarge toolbar for Qt high-dpi.
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -724,13 +724,6 @@ def _init_toolbar(self):
             labelAction = self.addWidget(self.locLabel)
             labelAction.setVisible(True)
 
-        # 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() and self.canvas._dpi_ratio > 1:
-            self.setIconSize(QtCore.QSize(24, 24))
-            self.layout().setSpacing(12)
-
     @cbook.deprecated("3.1")
     @property
     def buttons(self):
@@ -741,15 +734,6 @@ def buttons(self):
     def adj_window(self):
         return None
 
-    def sizeHint(self):
-        size = super().sizeHint()
-        if is_pyqt5() and self.canvas._dpi_ratio > 1:
-            # 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.
-            size.setHeight(max(48, size.height()))
-        return size
-
     def edit_parameters(self):
         axes = self.canvas.figure.get_axes()
         if not axes:
