gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 08:30:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ignore the first mouse up in transient menus if style is NSWindows95InterfaceStyle.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36852 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Germán Arias 2013-07-08 19:20:36 +00:00
parent 17db14c969
commit 4fe34147c1
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-07-08 German A. Arias <german@xelalug.org>
* Source/NSMenuView.m (_trackWithEvent:startingMenuView:):
Ignore the first mouse up if is a transient menu and style
is NSWindows95InterfaceStyle.
2013-07-07 German A. Arias <german@xelalug.org>
* Headers/AppKit/NSCursor.h:

23
Source/NSMenuView.m
View file

@ -1454,6 +1454,8 @@ static NSMapTable *viewInfo = 0;
int delayCount = 0;
int indexOfActionToExecute = -1;
int firstIndex = -1;
NSInterfaceStyle style =
NSInterfaceStyleForKey(@"NSMenuInterfaceStyle", self);
NSEvent *original;
NSEventType type;
@ -1496,21 +1498,22 @@ static NSMapTable *viewInfo = 0;
/*We need know if the user press a modifier key to close the menu
when the menu is in a window*/
if (NSInterfaceStyleForKey(@"NSMenuInterfaceStyle", self) ==
NSWindows95InterfaceStyle)
if (style == NSWindows95InterfaceStyle)
{
eventMask |= NSFlagsChangedMask;
}
/* We attempt to mimic Mac OS X behavior for pop up menus. If the user
presses the mouse button over a pop up button and then drags the mouse
over the menu, the menu is closed when the user releases the mouse. On the
other hand, when the user clicks on the button and then moves the mouse
the menu is closed upon the next mouse click. */
// Ignore the first mouse up if menu is horizontal.
if ([self isHorizontal] == YES ||
([[self menu] _ownedByPopUp] == YES &&
NSInterfaceStyleForKey(@"NSMenuInterfaceStyle", self)
== NSMacintoshInterfaceStyle))
// Or if menu is transient and style is NSWindows95InterfaceStyle.
([[self menu] isTransient] && style == NSWindows95InterfaceStyle) ||
/* Or to mimic Mac OS X behavior for pop up menus. If the user
presses the mouse button over a pop up button and then drags the mouse
over the menu, the menu is closed when the user releases the mouse. On
the other hand, when the user clicks on the button and then moves the
mouse the menu is closed upon the next mouse click. */
([[self menu] _ownedByPopUp] &&
style == NSMacintoshInterfaceStyle))
{
/*
* Ignore the first mouse up if nothing interesting has happened.