gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-25 03:51:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

another tweak for using pointer identity rather than object equality

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@39123 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2015-11-02 18:31:04 +00:00
parent 95a6eb6766
commit 77bfc5d864
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Source/NSOutlineView.m
View file

@ -65,6 +65,7 @@
#import "GSGuiPrivate.h" #import "GSGuiPrivate.h"
#include <math.h> #include <math.h>
static NSMapTableKeyCallBacks keyCallBacks;
static NSNotificationCenter *nc = nil; static NSNotificationCenter *nc = nil;
static const int current_version = 1; static const int current_version = 1;
@ -144,6 +145,11 @@ static NSImage *unexpandable = nil;
{ {
[self setVersion: current_version]; [self setVersion: current_version];
nc = [NSNotificationCenter defaultCenter]; nc = [NSNotificationCenter defaultCenter];
/* We need special map table callbacks, to check for identical
* objects rather than merely equal objects.
*/
keyCallBacks = NSObjectMapKeyCallBacks;
keyCallBacks.isEqual = NSOwnedPointerMapKeyCallBacks.isEqual;
#if 0 #if 0
/* Old Interface Builder style. */ /* Old Interface Builder style. */
collapsed = [NSImage imageNamed: @"common_outlineCollapsed"]; collapsed = [NSImage imageNamed: @"common_outlineCollapsed"];
@ -208,7 +214,7 @@ static NSImage *unexpandable = nil;
* Causes the outline column, the column containing the expand/collapse * Causes the outline column, the column containing the expand/collapse
* gadget, to resize based on the amount of space needed by widest content. * gadget, to resize based on the amount of space needed by widest content.
*/ */
- (BOOL)autoResizesOutlineColumn - (BOOL) autoResizesOutlineColumn
{ {
return _autoResizesOutlineColumn; return _autoResizesOutlineColumn;
} }
@ -217,7 +223,7 @@ static NSImage *unexpandable = nil;
* Causes the outline column, the column containing the expand/collapse * Causes the outline column, the column containing the expand/collapse
* gadget, to resize based on the amount of space needed by widest content. * gadget, to resize based on the amount of space needed by widest content.
*/ */
- (BOOL)autosaveExpandedItems - (BOOL) autosaveExpandedItems
{ {
return _autosaveExpandedItems; return _autosaveExpandedItems;
} }
@ -649,7 +655,7 @@ static NSImage *unexpandable = nil;
/** /**
* Sets the amount, in points, that each level is to be indented by. * Sets the amount, in points, that each level is to be indented by.
*/ */
- (void)setIndentationPerLevel: (CGFloat)newIndentLevel - (void) setIndentationPerLevel: (CGFloat)newIndentLevel
{ {
_indentationPerLevel = newIndentLevel; _indentationPerLevel = newIndentLevel;
} }
@ -719,10 +725,10 @@ static NSImage *unexpandable = nil;
// create a new empty one // create a new empty one
_items = [[NSMutableArray alloc] init]; _items = [[NSMutableArray alloc] init];
_itemDict = NSCreateMapTable(NSObjectMapKeyCallBacks, _itemDict = NSCreateMapTable(keyCallBacks,
NSObjectMapValueCallBacks, NSObjectMapValueCallBacks,
64); 64);
_levelOfItems = NSCreateMapTable(NSObjectMapKeyCallBacks, _levelOfItems = NSCreateMapTable(keyCallBacks,
NSObjectMapValueCallBacks, NSObjectMapValueCallBacks,
64); 64);
@ -847,8 +853,8 @@ static NSImage *unexpandable = nil;
position += _columnOrigins[_clickedColumn]; position += _columnOrigins[_clickedColumn];
if ([self isExpandable:item] if ([self isExpandable:item]
&& location.x >= position && location.x >= position
&& location.x <= position + [image size].width) && location.x <= position + [image size].width)
{ {
BOOL withChildren = BOOL withChildren =
([theEvent modifierFlags] & NSAlternateKeyMask) ? YES : NO; ([theEvent modifierFlags] & NSAlternateKeyMask) ? YES : NO;