Few fixes for previous menu commits

Signed-off-by: 280north <admin+280north@280north.com>
280north · Jan 4, 2009 · 3235cfd · 3235cfd
1 parent 899db8f
commit 3235cfd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/AppKit/CPMenu.j b/AppKit/CPMenu.j
@@ -181,10 +181,7 @@ var _CPMenuBarVisible               = NO,
 
 + (float)menuBarHeight
 {
-    if ([self menuBarVisible])
-        return MENUBAR_HEIGHT;
-
-    return 0.0;
+    return MENUBAR_HEIGHT;
 }
 
 // Creating a CPMenu Object
@@ -1007,10 +1004,6 @@ var STICKY_TIME_INTERVAL        = 500,
 
     [self setFrameSize:CGSizeMake(LEFT_MARGIN + menuViewSize.width + RIGHT_MARGIN, TOP_MARGIN + menuViewSize.height + BOTTOM_MARGIN)];
 
-    for(var i = 0; i < [aMenu numberOfItems]; i++)
-        if([[aMenu itemAtIndex:i] isSeparatorItem])
-            [[[aMenu itemAtIndex:i] view] setFrameSize:CPSizeMake(menuViewSize.width, 20.0)];
-
     [_menuView scrollPoint:CGPointMake(0.0, 0.0)];
     [_menuClipView setFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, menuViewSize.width, menuViewSize.height)];
 }

diff --git a/AppKit/CPMenuItem.j b/AppKit/CPMenuItem.j
@@ -734,6 +734,7 @@ CPControlKeyMask
         var view = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 20.0)],
             line = [[CPView alloc] initWithFrame:CGRectMake(0.0, 8.0, 1000.0, 1.3)];
         [line setBackgroundColor:[CPColor lightGrayColor]];
+        [view setAutoresizingMask:CPViewWidthSizable];
         [view addSubview:line];
 
         [self setView:view];