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

Revert last commit.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36849 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Germán Arias 2013-07-08 01:33:25 +00:00
parent 5cfee62130
commit 17db14c969
3 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-07-07 German A. Arias <german@xelalug.org>
* Headers/AppKit/NSCursor.h:
* Source/NSCursor.m (-init, -push, -pop): Revert last commit.
2013-07-07 German A. Arias <german@xelalug.org>
* Headers/AppKit/NSCursor.h: Add _windowNum and _cursorRect.

2
Headers/AppKit/NSCursor.h
View file

@ -49,8 +49,6 @@
unsigned int reserved: 25;
} _cursor_flags;
void *_cid;
NSInteger _windowNum;
NSRect _cursorRect;
}
/*

23
Source/NSCursor.m
View file

@ -35,13 +35,11 @@
#import "AppKit/NSColor.h"
#import "AppKit/NSCursor.h"
#import "AppKit/NSEvent.h"
#import "AppKit/NSGraphics.h"
#import "AppKit/NSImage.h"
#import "AppKit/NSBitmapImageRep.h"
#import "GNUstepGUI/GSDisplayServer.h"
#import "GNUstepGUI/GSTrackingRect.h"
// Class variables
static NSMutableArray *gnustep_gui_cursor_stack;
@ -317,8 +315,6 @@ NSCursor *getStandardCursor(NSString *name, int style)
*/
- (id) init
{
_windowNum = -1;
_cursorRect = NSZeroRect;
return [self initWithImage: nil hotSpot: NSZeroPoint];
}
@ -444,26 +440,11 @@ backgroundColorHint:(NSColor *)bg
}
else if (_cursor_flags.is_set_on_mouse_exited == NO)
{
NSInteger num = [theEvent windowNumber];
GSTrackingRect *r =(GSTrackingRect*)[theEvent userData];
/*
* Undocumented behavior - if a cursor is not set on exit or entry,
* we assume a push-pop situation instead.
*/
/* First check if the cursor rect is currently updated. This prevent
* add the same cursor for the same cursor rect. This happen sometimes
* when the window become the main/key window, and the cursor is over
* a cursor rect.
*/
if ( !(NSEqualRects(_cursorRect, r->rectangle) &&
(_windowNum == num) &&
[gnustep_gui_current_cursor isEqual: self]) )
{
[self push];
_windowNum = num;
_cursorRect = r->rectangle;
}
[self push];
}
}
@ -485,8 +466,6 @@ backgroundColorHint:(NSColor *)bg
* we assume a push-pop situation instead.
*/
[self pop];
_windowNum = -1;
_cursorRect = NSZeroRect;
}
else
{