mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-10-10 02:40:59 +00:00
Few fixes for previous menu commits
Signed-off-by: 280north <admin+280north@280north.com>
This commit is contained in:
1 parent
899db8fe0b
commit
3235cfd288
2 files changed
+2
-8
No files matched your search
+1
-8
@@ -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)];
|
||||
}
|
||||
|
||||
@@ -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];
|
||||
|
||||
Reference in new issue
Block a user