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

expand or collapse all when item is nil

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38975 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Doug Simons 2015-09-08 22:54:55 +00:00
parent 3f64428c30
commit f2bf25a5f8
2 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2015-09-08 Doug Simons <doug.simons@testplant.com>
* Source/NSOutlineView.m: Update expandItem:expandChildren:
and collapseItem:collapseChildren: to expand or collapse all
when item is nil (as updated in OSX 10.5).
2015-08-25 Doug Simons <doug.simons@testplant.com>
* Source/GSTextFinder.m: Fix Ignore Case option to work.

41
Source/NSOutlineView.m
View file

@ -250,17 +250,21 @@ static NSImage *unexpandable = nil;
canCollapse = [_delegate outlineView: self shouldCollapseItem: item];
}
if ([self isExpandable: item] && [self isItemExpanded: item] && canCollapse)
if ((item == nil || ([self isExpandable: item] && [self isItemExpanded: item])) && canCollapse)
{
NSMutableDictionary *infoDict = [NSMutableDictionary dictionary];
NSMutableDictionary *infoDict = nil;
if (item != nil)
{
infoDict = [NSMutableDictionary dictionary];
[infoDict setObject: item forKey: @"NSObject"];
[infoDict setObject: item forKey: @"NSObject"];
// Send out the notification to let observers know that this is about
// to occur.
[nc postNotificationName: NSOutlineViewItemWillCollapseNotification
object: self
userInfo: infoDict];
// Send out the notification to let observers know that this is about
// to occur.
[nc postNotificationName: NSOutlineViewItemWillCollapseNotification
object: self
userInfo: infoDict];
}
// recursively find all children and call this method to close them.
// Note: The children must be collapsed before their parent item so
@ -286,14 +290,17 @@ static NSImage *unexpandable = nil;
}
}
// collapse...
[self _closeItem: item];
if (item != nil)
{
// collapse...
[self _closeItem: item];
// Send out the notification to let observers know that this has
// occured.
[nc postNotificationName: NSOutlineViewItemDidCollapseNotification
object: self
userInfo: infoDict];
// Send out the notification to let observers know that this has
// occured.
[nc postNotificationName: NSOutlineViewItemDidCollapseNotification
object: self
userInfo: infoDict];
}
// Should only mark the rect below the closed item for redraw
[self setNeedsDisplay: YES];
@ -325,10 +332,10 @@ static NSImage *unexpandable = nil;
}
// if the item is expandable
if ([self isExpandable: item])
if (item == nil || [self isExpandable: item])
{
// if it is not already expanded and it can be expanded, then expand
if (![self isItemExpanded: item] && canExpand)
if (item != nil && ![self isItemExpanded: item] && canExpand)
{
NSMutableDictionary *infoDict = [NSMutableDictionary dictionary];