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

* Headers/Additions/GNUstepGUI/GSToolbarView.h

Browse source 
* Source/GSToolbarView.m
	Change draggedItemIndex to NSUInteger.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@40270 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2016-12-17 00:00:19 +00:00
parent bc9b909528
commit ca8abf4c27
3 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2016-12-17 Fred Kiefer <FredKiefer@gmx.de>
* Headers/Additions/GNUstepGUI/GSToolbarView.h
* Source/GSToolbarView.m
Change draggedItemIndex to NSUInteger.
2016-12-15 Wolfgang Lux <wolfgang.lux@gmail.com>
* Source/NSWorkspace.m: Change mlock into a private variable to

4
Headers/Additions/GNUstepGUI/GSToolbarView.h
View file

@ -60,8 +60,8 @@ typedef enum {
float _heightFromLayout;
}
+ (int) draggedItemIndex;
+ (void) setDraggedItemIndex:(int)sourceIndex;
+ (NSUInteger) draggedItemIndex;
+ (void) setDraggedItemIndex:(NSUInteger)sourceIndex;
- (id) initWithFrame: (NSRect)frame;

21
Source/GSToolbarView.m
View file

@ -66,7 +66,7 @@ static const int ClippedItemsViewWidth = 28;
// Internal
static const int current_version = 1;
static NSInteger draggedItemIndex = NSNotFound;
static NSUInteger draggedItemIndex = NSNotFound;
/*
* Toolbar related code
@ -251,19 +251,19 @@ static NSInteger draggedItemIndex = NSNotFound;
// Dragging related methods
+ (int) draggedItemIndex
+ (NSUInteger) draggedItemIndex
{
return draggedItemIndex;
}
+ (void) setDraggedItemIndex:(int)sourceIndex
+ (void) setDraggedItemIndex:(NSUInteger)sourceIndex
{
draggedItemIndex = sourceIndex;
}
- (int) _insertionIndexAtPoint: (NSPoint)location
{
int index;
NSUInteger index;
NSArray *visibleBackViews = [self _visibleBackViews];
location = [_clipView convertPoint:location fromView:nil];
@ -299,7 +299,6 @@ static NSInteger draggedItemIndex = NSNotFound;
itemRect = [[visibleBackViews objectAtIndex:index] frame];
if (location.x < (itemRect.origin.x + (itemRect.size.width/2)))
{
NSLog(@"To the LEFT of %d", index);
return index;
}
}
@ -307,12 +306,12 @@ static NSInteger draggedItemIndex = NSNotFound;
else
{
// dragging to the right of current location
// Never called for [visibleBackViews count] == 0
for (index=[visibleBackViews count]-1; index > draggedItemIndex; index--)
{
itemRect = [[visibleBackViews objectAtIndex:index] frame];
if (location.x > (itemRect.origin.x + (itemRect.size.width/2)))
{
NSLog(@"To the RIGHT of %d", index);
return index;
}
}
@ -321,6 +320,8 @@ static NSInteger draggedItemIndex = NSNotFound;
}
}
#define OUTSIDE_INDEX (NSNotFound - 1)
- (NSDragOperation) updateItemWhileDragging:(id <NSDraggingInfo>)info exited:(BOOL)exited
{
NSToolbarItem *item = [[info draggingSource] toolbarItem];
@ -341,7 +342,7 @@ static NSInteger draggedItemIndex = NSNotFound;
if (![item allowsDuplicatesInToolbar])
{
NSArray *items = [toolbar items];
NSInteger index;
NSUInteger index;
for (index=0; index<[items count]; index++)
{
NSToolbarItem *anItem = [items objectAtIndex:index];
@ -353,7 +354,7 @@ static NSInteger draggedItemIndex = NSNotFound;
}
}
}
else if (draggedItemIndex == -1)
else if (draggedItemIndex == OUTSIDE_INDEX)
{
// re-entering after being dragged off -- treat as unknown location
draggedItemIndex = NSNotFound;
@ -367,7 +368,7 @@ static NSInteger draggedItemIndex = NSNotFound;
if (exited)
{
[toolbar _removeItemAtIndex:draggedItemIndex broadcast:YES];
draggedItemIndex = -1; // no longer in our items
draggedItemIndex = OUTSIDE_INDEX; // no longer in our items
}
else
{
@ -386,7 +387,7 @@ static NSInteger draggedItemIndex = NSNotFound;
broadcast: YES];
draggedItemIndex = newIndex;
}
return NSDragOperationGeneric;
return NSDragOperationGeneric;
}
- (NSDragOperation) draggingEntered: (id <NSDraggingInfo>)info