fix: update shutter widget color when closed (#399)

* fix: set default color for closed to gray

* test: fix

* pre-commit cfg

* fix types

* update color

* fix for 3.9

* style(pre-commit.ci): auto fixes [...]

* remove comment

* spacing

* fix typing MDAWidget

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Talley Lambert <talley.lambert@gmail.com>

Author: 3 people

.pre-commit-config.yaml

@@ -27,5 +27,5 @@ repos:
       - id: mypy
         files: "^src/"
         additional_dependencies:
-          - pymmcore-plus >=0.11.0
+          - pymmcore-plus >=0.13.4
           - useq-schema >=0.5.0

src/pymmcore_widgets/control/_shutter_widget.py

@@ -11,6 +11,9 @@
 from superqt.fonticon import icon
 from superqt.utils import signals_blocked
 
+GRAY = (183, 183, 183)
+GREEN = (0, 255, 0)
+
 COLOR_TYPE = Union[
     QColor,
     int,
@@ -59,8 +62,8 @@ def __init__(
 
         self._icon_open: str = MDI6.hexagon_outline
         self._icon_closed: str = MDI6.hexagon_slice_6
-        self._icon_color_open: COLOR_TYPE = (0, 255, 0)
-        self._icon_color_closed: COLOR_TYPE = "magenta"
+        self._icon_color_open: COLOR_TYPE = GREEN
+        self._icon_color_closed: COLOR_TYPE = GRAY
         self._icon_size: int = 25
         self._button_text_open: str = ""
         self._button_text_closed: str = ""
@@ -143,7 +146,7 @@ def icon_color_closed(self) -> COLOR_TYPE:
         """
         Set the button icon color for when the shutter is closed.
 
-        Default = 'magenta'
+        Default = (183, 183, 183)
 
         COLOR_TYPE = Union[QColor, int, str, Qt.GlobalColor, tuple[int, int, int, int],
         tuple[int, int, int]]
@@ -203,7 +206,7 @@ def button_text_closed(self, text: str) -> None:
     def _create_wdg(self) -> None:
         main_layout = QHBoxLayout()
         main_layout.setContentsMargins(0, 0, 0, 0)
-        main_layout.setSpacing(3)
+        main_layout.setSpacing(7)
 
         self.shutter_button = QPushButton(text=self._button_text_closed)
         sizepolicy_btn = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)

tests/test_shutter_widget.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from pymmcore_widgets.control._shutter_widget import ShuttersWidget
+from pymmcore_widgets.control._shutter_widget import GRAY, GREEN, ShuttersWidget
 
 if TYPE_CHECKING:
     from pymmcore_plus import CMMCorePlus
@@ -201,13 +201,13 @@ def test_shutter_widget_setters(qtbot: QtBot, global_mmcore: CMMCorePlus):
     shutter.icon_size = 30
     assert shutter.icon_size == 30
 
-    assert shutter.icon_color_open == (0, 255, 0)
-    shutter.icon_color_open = "magenta"
-    assert shutter.icon_color_open == "magenta"
+    assert shutter.icon_color_open == GREEN
+    shutter.icon_color_open = GRAY
+    assert shutter.icon_color_open == GRAY
 
-    assert shutter.icon_color_closed == "magenta"
-    shutter.icon_color_closed = (0, 255, 0)
-    assert shutter.icon_color_closed == (0, 255, 0)
+    assert shutter.icon_color_closed == GRAY
+    shutter.icon_color_closed = GREEN
+    assert shutter.icon_color_closed == GREEN
 
     assert shutter.button_text_open == "Shutter opened"
     shutter.button_text_open = "O"