Merge pull request #180 from robotools/colorwellStyleArgument

Colorwell style argument

Author: typesupply

Lib/vanilla/vanillaBase.py

@@ -37,6 +37,7 @@ class VanillaWarning(Warning): pass
 if platform.system() != "Darwin":
     macVersion = "0.0"
 osVersionCurrent = version(macVersion)
+osVersion13_0 = version("13.0")
 osVersion12_0 = version("12.0")
 osVersion10_16 = version("10.16")  # macOS11 Big Sur seems to be 10.16
 osVersion10_15 = version("10.15")

Lib/vanilla/vanillaColorWell.py

@@ -1,5 +1,17 @@
 from AppKit import NSColorWell, NSColorPanel
-from vanilla.vanillaBase import VanillaBaseObject
+from vanilla.vanillaBase import VanillaBaseObject, osVersionCurrent, osVersion13_0
+
+if osVersionCurrent >= osVersion13_0:
+    from AppKit import NSColorWellStyleDefault, NSColorWellStyleMinimal, NSColorWellStyleExpanded
+
+    colorWellStyleMap = dict(
+        default=NSColorWellStyleDefault,
+        minimal=NSColorWellStyleMinimal,
+        expanded=NSColorWellStyleExpanded
+    )
+
+else:
+    colorWellStyleMap = dict()
 
 
 class ColorWell(VanillaBaseObject):
@@ -38,17 +50,32 @@ def colorWellEdit(self, sender):
     **color** A `NSColor`_ object. If *None* is given, the color shown will
     be white.
 
+    **colorWellStyle** A string representing the desired color well style. The options are:
+
+    +------------+
+    | "default"  |
+    +------------+
+    | "minimal"  |
+    +------------+
+    | "expanded" |
+    +------------+
+
     .. _NSColor: https://developer.apple.com/documentation/appkit/nscolor?language=objc
     """
 
     nsColorWellClass = NSColorWell
 
-    def __init__(self, posSize, callback=None, color=None):
+    def __init__(self, posSize, callback=None, color=None, colorWellStyle=None):
         self._setupView(self.nsColorWellClass, posSize, callback=callback)
         if color is not None:
             self._nsObject.setColor_(color)
         colorPanel = NSColorPanel.sharedColorPanel()
         colorPanel.setShowsAlpha_(True)
+        if osVersionCurrent >= osVersion13_0:
+            # https://developer.apple.com/documentation/appkit/nscolorwell/3955203-colorwellstyle?language=objc
+            nsColorWellStyle = colorWellStyleMap.get(colorWellStyle)
+            if nsColorWellStyle is not None:
+                colorPanel.setColorWellStyle_(nsColorWellStyle)
 
     def getNSColorWell(self):
         """

Lib/vanilla/vanillaList2.py

@@ -1301,11 +1301,15 @@ class ColorWellList2Cell(ColorWell):
 
     def __init__(self,
             editable=False,
-            callback=None
+            callback=None,
+            colorWellStyle=None
         ):
+        if colorWellStyle is None:
+            colorWellStyle = "minimal"
         super().__init__(
             "auto",
-            callback=callback
+            callback=callback,
+            colorWellStyle=colorWellStyle
         )
         colorWell = self.getNSColorWell()
         self.enable(editable)