gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 14:00:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fun fixes.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4877 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
michael 1999-09-12 03:19:36 +00:00
parent 4026532377
commit 3d2b84054e
6 changed files with 697 additions and 639 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/NSMenu.m
View file

@ -105,7 +105,6 @@ static NSString* NSMenuLocationsKey = @"NSMenuLocations";
menu_follow_transient = NO;
menu_is_beholdenToPopUpButton = YES;
ASSIGN(menu_popb, popb);
// menu_popb = popb;
menu_changed = YES;
/* According to the spec, menus do autoenable by default */
@ -171,8 +170,8 @@ static NSString* NSMenuLocationsKey = @"NSMenuLocations";
defer: NO];
titleView = [NSMenuWindowTitleView new];
[titleView setFrameOrigin: NSMakePoint(0, winRect.size.height-21)];
[titleView setFrameSize: NSMakeSize (winRect.size.width, 21)];
[titleView setFrameOrigin: NSMakePoint(0, winRect.size.height-22)];
[titleView setFrameSize: NSMakeSize (winRect.size.width, 22)];
[[aWindow contentView] addSubview:menu_view];
[[aWindow contentView] addSubview:titleView];
[titleView setMenu: self];
@ -515,7 +514,7 @@ static NSString* NSMenuLocationsKey = @"NSMenuLocations";
NSPoint subOrigin = [win_link convertBaseToScreen: NSMakePoint(aRect.origin.x, aRect.origin.y)];
return NSMakePoint (frame.origin.x + frame.size.width + 1,
subOrigin.y - (submenuFrame.size.height - 41));
subOrigin.y - (submenuFrame.size.height - 42));
}
else
{
@ -727,20 +726,17 @@ static NSString* NSMenuLocationsKey = @"NSMenuLocations";
if (!menu_is_beholdenToPopUpButton)
{
size.height += 21;
size.height += 22;
[aWindow setContentSize: size];
[bWindow setContentSize: size];
[menu_view setFrameOrigin: NSMakePoint(0, 0)];
[titleView setFrame: NSMakeRect(0,size.height-21,size.width,21)];
[titleView setFrame: NSMakeRect(0,size.height-22,size.width,22)];
}
else
{
[aWindow setContentSize: size];
}
// FIXME, popup sets itself up.
// [menu_view setNeedsDisplay:YES];
[aWindow display];
menu_changed = NO;
@ -862,11 +858,9 @@ NSArray* array;
if (menu_changed)
[self sizeToFit];
if (menu_supermenu && ![self isTornOff]) // query super menu for
if (menu_supermenu && ![self isTornOff]) // query super menu for
{ // position
NSPoint location = [menu_supermenu locationForSubmenu: self];
[aWindow setFrameOrigin: location];
[aWindow setFrameOrigin:[menu_supermenu locationForSubmenu: self]];
menu_supermenu->menu_attached_menu = self;
}
else