gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 05:10:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge from 0.7.0

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10329 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2001-07-09 02:49:03 +00:00
parent ce3b319c5a
commit a56278096e
27 changed files with 794 additions and 478 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Source/NSBrowser.m
View file

@ -536,14 +536,11 @@ static float scrollerWidth; // == [NSScroller scrollerWidth]
NSArray *subStrings;
NSString *aStr;
unsigned numberOfSubStrings;
unsigned i, j;
BOOL found = NO;
unsigned i, j, column = 0;
BOOL found = YES;
// Column Zero is always present.
[self loadColumnZero];
// If that's all, return.
if (path == nil || [path isEqualToString: _pathSeparator])
if (path == nil)
{
[self setNeedsDisplay: YES];
return YES;
@ -554,29 +551,42 @@ static float scrollerWidth; // == [NSScroller scrollerWidth]
numberOfSubStrings = [subStrings count];
// Ignore a trailing void component.
if (![subStrings objectAtIndex: 0])
if (numberOfSubStrings > 0
&& [[subStrings objectAtIndex: 0] isEqualToString: @""])
{
NSRange theRange;
theRange.location = 1;
numberOfSubStrings--;
theRange.length = numberOfSubStrings;
subStrings = [subStrings subarrayWithRange: theRange];
if (numberOfSubStrings)
{
NSRange theRange;
theRange.location = 1;
theRange.length = numberOfSubStrings;
subStrings = [subStrings subarrayWithRange: theRange];
}
[self loadColumnZero];
}
column = _lastColumnLoaded;
if (column < 0)
column = 0;
// cycle thru str's array created from path
for (i = 1; i < numberOfSubStrings; i++)
for (i = 0; i < numberOfSubStrings; i++)
{
NSBrowserColumn *bc = [_browserColumns objectAtIndex: i - 1];
NSBrowserColumn *bc = [_browserColumns objectAtIndex: column + i];
NSMatrix *matrix = [bc columnMatrix];
NSArray *cells = [matrix cells];
unsigned numOfRows = [cells count];
NSBrowserCell *selectedCell = nil;
found = NO;
aStr = [subStrings objectAtIndex: i];
if (aStr)
if (![aStr isEqualToString: @""])
{
found = NO;
// find the cell in the browser matrix which is equal to aStr
for (j = 0; j < numOfRows; j++)
{
@ -595,8 +605,8 @@ static float scrollerWidth; // == [NSScroller scrollerWidth]
// if unable to find a cell whose title matches aStr return NO
if (found == NO)
{
NSLog (@"NSBrowser: unable to find cell '%@' in column %d\n",
aStr, i - 1);
NSDebugLog (@"NSBrowser: unable to find cell '%@' in column %d\n",
aStr, column + i);
break;
}
// if the cell is a leaf, we are finished setting the path
@ -2183,7 +2193,6 @@ static float scrollerWidth; // == [NSScroller scrollerWidth]
_firstVisibleColumn = 0;
_lastVisibleColumn = 0;
[self _createColumn];
NSLog(@"init2 %f", _frame.size.width);
return self;
}