From ee45191676eb966ade2d88209ee5f782d46d03c3 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Wed, 2 Aug 2006 00:29:10 +0000 Subject: [PATCH] Simplify new Open menu item text. --- macosx/English.lproj/MainMenu.nib/info.nib | 2 +- .../MainMenu.nib/keyedobjects.nib | Bin 44902 -> 44906 bytes macosx/MenuButton.m | 22 +++++++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib index bf682d70f..86c2853db 100644 --- a/macosx/English.lproj/MainMenu.nib/info.nib +++ b/macosx/English.lproj/MainMenu.nib/info.nib @@ -31,8 +31,8 @@ 3 IBOpenObjects - 21 29 + 21 IBSystem Version 8J135 diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib index 424b071c7b48e000465cbaeaadf342ddaa80021d..41fc85e5d176c614a0be48701a63c185b33dff61 100644 GIT binary patch delta 10529 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 P{GPY)@%!Jeld}I0pDrzX diff --git a/macosx/MenuButton.m b/macosx/MenuButton.m index f8b4b63ca..9e94044e4 100644 --- a/macosx/MenuButton.m +++ b/macosx/MenuButton.m @@ -31,15 +31,21 @@ NSImage * image = [self image]; [self setImage: [self alternateImage]]; + //approximate height of menu...alright for now + /*float menuHeight = ((float)[[self menu] numberOfItems] + 2.0) * [NSMenuView menuBarHeight]; + BOOL moveToTop = menuHeight > [[self window] frame].origin.y;*/ + + NSPoint point = NSMakePoint(3.0, /*moveToTop ? [self frame].size.height + menuHeight :*/ -2.0); + NSEvent * newEvent= [NSEvent mouseEventWithType: [event type] - location: NSMakePoint(3, -2) - modifierFlags: [event modifierFlags] - timestamp: [event timestamp] - windowNumber: [event windowNumber] - context: [event context] - eventNumber: [event eventNumber] - clickCount: [event clickCount] - pressure: [event pressure]]; + location: point + modifierFlags: [event modifierFlags] + timestamp: [event timestamp] + windowNumber: [event windowNumber] + context: [event context] + eventNumber: [event eventNumber] + clickCount: [event clickCount] + pressure: [event pressure]]; [NSMenu popUpContextMenu: [self menu] withEvent: newEvent forView: self];