From f5855c2a91d070a05d5b3857327d224b390349d5 Mon Sep 17 00:00:00 2001 From: Sam Cunliffe Date: Wed, 31 May 2023 22:32:48 +0100 Subject: [PATCH] ICON_ROOT no longer needs to be a global. --- src/napari_matplotlib/base.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/napari_matplotlib/base.py b/src/napari_matplotlib/base.py index 820f22e4..f948d017 100644 --- a/src/napari_matplotlib/base.py +++ b/src/napari_matplotlib/base.py @@ -14,9 +14,6 @@ from .util import Interval, from_napari_css_get_size_of -# Icons modified from -# https://github.com/matplotlib/matplotlib/tree/main/lib/matplotlib/mpl-data/images -ICON_ROOT = Path(__file__).parent / "icons" __all__ = ["BaseNapariMPLWidget", "NapariMPLWidget"] @@ -122,11 +119,15 @@ def _theme_has_light_bg(self) -> bool: def _get_path_to_icon(self) -> Path: """ Get the icons directory (which is theme-dependent). + + Icons modified from + https://github.com/matplotlib/matplotlib/tree/main/lib/matplotlib/mpl-data/images """ + icon_root = Path(__file__).parent / "icons" if self._theme_has_light_bg(): - return ICON_ROOT / "black" + return icon_root / "black" else: - return ICON_ROOT / "white" + return icon_root / "white" def _replace_toolbar_icons(self) -> None: """