Don't change the location of submenus in NSMacintoshInterfaceStyle.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@37161 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
espectador 2013-09-27 22:20:12 +00:00
parent b751aed5b0
commit 5ec2ca791b
2 changed files with 18 additions and 3 deletions

View file

@ -1,3 +1,8 @@
2013-09-27 German Arias <germanandre@gmx.es>
* Source/NSMenuView.m (-locationForSubmenu:): Don't change the location
of submenu if menu is horizontal and style is NSMacintoshInterfaceStyle.
2013-09-27 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSBrowserCell.m (-drawInteriorWithFrame:inView:): Don't

View file

@ -1088,9 +1088,19 @@ static NSMapTable *viewInfo = 0;
[_attachedMenu indexOfItemWithSubmenu: aSubmenu]] toView: nil];
NSPoint subOrigin = [_window convertBaseToScreen: aRect.origin];
/*We add +1 for don't lose the track when the user move the
mouse from the horizontal menu to a submenu.*/
return NSMakePoint(subOrigin.x, subOrigin.y - NSHeight(submenuFrame) + 1);
/* If menu is in window, we add +1 for don't lose the track when
the user move the mouse from the horizontal menu to a submenu.*/
if (NSInterfaceStyleForKey(@"NSMenuInterfaceStyle", nil) ==
NSWindows95InterfaceStyle)
{
return NSMakePoint(subOrigin.x,
subOrigin.y - NSHeight(submenuFrame) + 1);
}
else
{
return NSMakePoint(subOrigin.x,
subOrigin.y - NSHeight(submenuFrame));
}
}
}