Solves #86.

Author: samcunliffe

src/napari_matplotlib/base.py

@@ -38,9 +38,11 @@ class BaseNapariMPLWidget(QWidget):
 
     def __init__(
         self,
+        napari_viewer: napari.Viewer,
         parent: Optional[QWidget] = None,
     ):
         super().__init__(parent=parent)
+        self.viewer = napari_viewer
 
         self.canvas = FigureCanvas()
 
@@ -50,6 +52,8 @@ def __init__(
             self.canvas, parent=self
         )  # type: ignore[no-untyped-call]
         self._replace_toolbar_icons()
+        # callback to update when napari theme changed
+        self.viewer.events.theme.connect(self._on_theme_change)
 
         self.setLayout(QVBoxLayout())
         self.layout().addWidget(self.toolbar)
@@ -69,25 +73,55 @@ def add_single_axes(self) -> None:
         self.axes = self.figure.subplots()
         self.apply_napari_colorscheme(self.axes)
 
-    @staticmethod
-    def apply_napari_colorscheme(ax: Axes) -> None:
+    def apply_napari_colorscheme(self, ax: Axes) -> None:
         """Apply napari-compatible colorscheme to an Axes."""
+        # get the foreground colours from current theme
+        theme = napari.utils.theme.get_theme(self.viewer.theme, as_dict=False)
+        fg = theme.foreground.as_hex()  # fg is a muted contrast to bg
+        tx = theme.text.as_hex()  # text is high contrast to bg
+
         # changing color of axes background to transparent
         ax.set_facecolor("none")
 
         # changing colors of all axes
         for spine in ax.spines:
-            ax.spines[spine].set_color("white")
+            ax.spines[spine].set_color(fg)
 
-        ax.xaxis.label.set_color("white")
-        ax.yaxis.label.set_color("white")
+        ax.xaxis.label.set_color(tx)
+        ax.yaxis.label.set_color(tx)
 
         # changing colors of axes labels
-        ax.tick_params(axis="x", colors="white")
-        ax.tick_params(axis="y", colors="white")
+        ax.tick_params(axis="x", colors=tx)
+        ax.tick_params(axis="y", colors=tx)
+
+    def _on_theme_change(self) -> None:
+        """
+        Update the MPL toolbar and axis styling when the `napari.Viewer.theme` is changed.
+
+        Note: At the moment we only recognise the default 'light' and 'dark' napari themes.
+        """
+        self._replace_toolbar_icons()
+        if self.figure.gca():
+            self.apply_napari_colorscheme(self.figure.gca())
+
+    def _get_path_to_icon(self) -> Path:
+        """
+        Get the icons directory (which is theme-dependent).
+        """
+        # TODO: can make this more robust by doing some RGB tricks to figure out
+        # whether white or black icons are going to be more visible given the
+        # theme.background
+        islight = self.viewer.theme == "light"
+        if islight:
+            return ICON_ROOT / "black"
+        else:
+            return ICON_ROOT / "white"
 
     def _replace_toolbar_icons(self) -> None:
-        # Modify toolbar icons and some tooltips
+        """
+        Modifies toolbar icons to match the napari theme, and add some tooltips.
+        """
+        icon_dir = self._get_path_to_icon()
         for action in self.toolbar.actions():
             text = action.text()
             if text == "Pan":
@@ -101,7 +135,7 @@ def _replace_toolbar_icons(self) -> None:
                     "Click again to deactivate"
                 )
             if len(text) > 0:  # i.e. not a separator item
-                icon_path = os.path.join(ICON_ROOT, text + ".png")
+                icon_path = os.path.join(icon_dir, text + ".png")
                 action.setIcon(QIcon(icon_path))
 
 
@@ -138,9 +172,7 @@ def __init__(
         napari_viewer: napari.viewer.Viewer,
         parent: Optional[QWidget] = None,
     ):
-        super().__init__(parent=parent)
-
-        self.viewer = napari_viewer
+        super().__init__(napari_viewer=napari_viewer, parent=parent)
         self._setup_callbacks()
         self.layers: List[napari.layers.Layer] = []
 
@@ -234,22 +266,24 @@ def __init__(self, *args, **kwargs):  # type: ignore[no-untyped-def]
     def _update_buttons_checked(self) -> None:
         """Update toggle tool icons when selected/unselected."""
         super()._update_buttons_checked()
+        icon_dir = self.parentWidget()._get_path_to_icon()
+
         # changes pan/zoom icons depending on state (checked or not)
         if "pan" in self._actions:
             if self._actions["pan"].isChecked():
                 self._actions["pan"].setIcon(
-                    QIcon(os.path.join(ICON_ROOT, "Pan_checked.png"))
+                    QIcon(os.path.join(icon_dir, "Pan_checked.png"))
                 )
             else:
                 self._actions["pan"].setIcon(
-                    QIcon(os.path.join(ICON_ROOT, "Pan.png"))
+                    QIcon(os.path.join(icon_dir, "Pan.png"))
                 )
         if "zoom" in self._actions:
             if self._actions["zoom"].isChecked():
                 self._actions["zoom"].setIcon(
-                    QIcon(os.path.join(ICON_ROOT, "Zoom_checked.png"))
+                    QIcon(os.path.join(icon_dir, "Zoom_checked.png"))
                 )
             else:
                 self._actions["zoom"].setIcon(
-                    QIcon(os.path.join(ICON_ROOT, "Zoom.png"))
+                    QIcon(os.path.join(icon_dir, "Zoom.png"))
                 )

src/napari_matplotlib/icons/black/Back.png

@@ -0,0 +1,19 @@
+import pytest
+from napari_matplotlib.base import NapariMPLWidget
+
+
+@pytest.mark.parametrize(
+    "theme_name, expected_icons",
+    [("dark", "white"), ("light", "black")],
+)
+def test_theme_mpl_toolbar_icons(
+    make_napari_viewer, theme_name, expected_icons
+):
+    """Check that the icons are taken from the correct folder for each napari theme."""
+    viewer = make_napari_viewer()
+    viewer.theme = theme_name
+    path_to_icons = NapariMPLWidget(viewer)._get_path_to_icon()
+    assert path_to_icons.exists(), "The theme points to non-existant icons."
+    assert (
+        path_to_icons.stem == expected_icons
+    ), "The theme is selecting unexpected icons."