Merge pull request #203 from robotools/popupbuttonListBorder

add support for bordered in a PopUpButton and a list2 PopUpButton
robotools · Feb 12, 2024 · 7c5a803 · 7c5a803
2 parents 8c8403b + 8ee74f2
commit 7c5a803
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Lib/vanilla/vanillaList2.py b/Lib/vanilla/vanillaList2.py
@@ -1316,11 +1316,13 @@ class PopUpButtonList2Cell(PopUpButton):
     def __init__(self,
             items=[],
             editable=False,
-            callback=None
+            callback=None,
+            bordered=False,
         ):
         super().__init__(
             "auto",
             items=items,
+            bordered=bordered,
             sizeStyle="small",
             callback=callback
         )

diff --git a/Lib/vanilla/vanillaPopUpButton.py b/Lib/vanilla/vanillaPopUpButton.py
@@ -68,14 +68,15 @@ def popUpButtonCallback(self, sender):
         "regular": (-3, -4, 6, 6),
     }
 
-    def __init__(self, posSize, items, callback=None, sizeStyle="regular"):
+    def __init__(self, posSize, items, callback=None, sizeStyle="regular", bordered=True):
         self._setupView(self.nsPopUpButtonClass, posSize)
         if self.nsPopUpButtonCellClass != NSPopUpButtonCell:
             self._nsObject.setCell_(self.nsPopUpButtonCellClass.alloc().init())
         if callback is not None:
             self._setCallback(callback)
         self._setSizeStyle(sizeStyle)
         self.setItems(items)
+        self._nsObject.setBordered_(bordered)
 
     def getNSPopUpButton(self):
         """
@@ -212,10 +213,9 @@ def subFirstCallback(self, sender):
     """
 
     def __init__(self, posSize, items, sizeStyle="regular", bordered=True):
-        super().__init__(posSize, items, sizeStyle=sizeStyle)
+        super().__init__(posSize, items, sizeStyle=sizeStyle, bordered=bordered)
         self._nsObject.setPullsDown_(True)
         self._nsObject.setBezelStyle_(NSTexturedRoundedBezelStyle)
-        self._nsObject.setBordered_(bordered)
 
     def _breakCycles(self):
         self._menuItemCallbackWrappers = None