Changeset 718

Timestamp:

Aug 2, 2006, 12:29:10 AM (17 years ago)

Author:

livings124

Message:

Simplify new Open menu item text.

Location:

trunk/macosx

Files:

• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• MenuButton.m (modified) (1 diff)

trunk/macosx/English.lproj/MainMenu.nib/info.nib

@@ -32 +32 @@
         <key>IBOpenObjects</key>
         <array>
+                <integer>29</integer>
                 <integer>21</integer>
-                <integer>29</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/MenuButton.m

@@ -32 +32 @@
     [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];