#428 - add default style name to MenuBar and reset it based on vertic…

…al parameter, by Serge
pyjs · Jun 23, 2010 · 0d63f3d · 0d63f3d
1 parent 97bd191
commit 0d63f3d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
                     Changes made to Pyjamas since 0.7
                     ---------------------------------
 
+ * Added default style name to MenuBar, by Serge Tarkovski 
+
  * Added makeCloseable and centring to DialogBox, by Serge Tarkovski 
 
  * Added default style to CaptionPanel, by Serge Tarkovski 

diff --git a/library/pyjamas/ui/MenuBar.py b/library/pyjamas/ui/MenuBar.py
@@ -24,15 +24,16 @@
 
 class MenuBar(Widget):
     def __init__(self, vertical=False, **kwargs):
-        if not kwargs.has_key('StyleName'): kwargs['StyleName']="gwt-MenuBar"
+        self.vertical = vertical
 
+        if not 'StyleName' in kwargs or kwargs['StyleName'] == 'gwt-MenuBar':
+            kwargs['StyleName'] = self.getDefaultStyleName()
         self.body = None
         self.items = []
         self.parentMenu = None
         self.popup = None
         self.selectedItem = None
         self.shownChildMenu = None
-        self.vertical = False
         self.autoOpen = False
 
         if kwargs.has_key('Element'):
@@ -52,13 +53,19 @@ def __init__(self, vertical=False, **kwargs):
             tr = DOM.createTR()
             DOM.appendChild(self.body, tr)
 
-        self.vertical = vertical
-
         outer = DOM.createDiv()
         DOM.appendChild(outer, table)
         self.setElement(outer)
         Widget.__init__(self, **kwargs)
 
+    def getDefaultStyleName(self):
+        return "gwt-MenuBar " + "gwt-MenuBar-vertical" if self.vertical else "gwt-MenuBar-horizontal"
+
+    def setStyleName(self, StyleName, **kwargs):
+        if not StyleName or StyleName == 'gwt-MenuBar':
+            StyleName = self.getDefaultStyleName()
+        super(MenuBar, self).setStyleName(StyleName, **kwargs)
+
     # also callable as:
     #   addItem(item)
     #   addItem(text, cmd)
@@ -161,7 +168,7 @@ def doItemAction(self, item, fireCommand):
         self.popup.addPopupListener(self)
 
         if self.vertical:
-            self.popup.setPopupPosition(self.getAbsoluteLeft() + 
+            self.popup.setPopupPosition(self.getAbsoluteLeft() +
                                         self.getOffsetWidth() - 1,
                                         item.getAbsoluteTop())
         else: