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

2000-08-13 Mirko Viviani <mirko.viviani@rccr.cremona.it>

Browse source 
* GSWDisplayGroup.m: fixed display next and previous batch.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@7199 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mirko 2000-08-13 14:22:02 +00:00
parent 4ac929d461
commit e0968b9281
2 changed files with 55 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2000-08-13 Mirko Viviani <mirko.viviani@rccr.cremona.it>
* GSWDisplayGroup.m: fixed display next and previous batch.
2000-08-01 Mirko Viviani <mirko.viviani@rccr.cremona.it>
* GSWDisplayGroup.m/.h: implemented (-setSelectedObject) to support

74
GSWeb.framework/GSWDisplayGroup.m
View file

@ -791,7 +791,11 @@ static char rcsId[] = "$Id$";
return 1;
count = [allObjects count];
return count / numberOfObjectsPerBatch +
if(!count)
return 1;
return (count / numberOfObjectsPerBatch) +
(count % numberOfObjectsPerBatch ? 1 : 0);
}
@ -1021,22 +1025,32 @@ static char rcsId[] = "$Id$";
int count = [allObjects count];
NSRange range;
if(batchIndex >= [self batchCount])
[displayedObjects removeAllObjects];
if(!numberOfObjectsPerBatch || count <= numberOfObjectsPerBatch)
{
batchIndex = 1;
range.location = 0;
range.length = numberOfObjectsPerBatch;
[displayedObjects addObjectsFromArray:allObjects];
}
else
{
batchIndex++;
range.location = (batchIndex-1) * numberOfObjectsPerBatch;
range.length = numberOfObjectsPerBatch;
}
if(batchIndex >= [self batchCount])
{
batchIndex = 1;
range.location = 0;
range.length = numberOfObjectsPerBatch;
}
else
{
range.location = batchIndex * numberOfObjectsPerBatch;
range.length = (range.location + numberOfObjectsPerBatch > count ?
count - range.location : numberOfObjectsPerBatch);
batchIndex++;
}
[displayedObjects removeAllObjects];
[displayedObjects addObjectsFromArray:[allObjects
subarrayWithRange:range]];
[displayedObjects addObjectsFromArray:[allObjects
subarrayWithRange:range]];
}
[self clearSelection];
@ -1051,22 +1065,33 @@ static char rcsId[] = "$Id$";
int count = [allObjects count];
NSRange range;
if(batchIndex == 1)
[displayedObjects removeAllObjects];
if(!numberOfObjectsPerBatch || count <= numberOfObjectsPerBatch)
{
batchIndex = [self batchCount];
range.location = (batchIndex-1) * numberOfObjectsPerBatch;
range.length = numberOfObjectsPerBatch;
batchIndex = 1;
[displayedObjects addObjectsFromArray:allObjects];
}
else
{
batchIndex--;
range.location = (batchIndex-1) * numberOfObjectsPerBatch;
range.length = numberOfObjectsPerBatch;
}
if(batchIndex == 1)
{
batchIndex = [self batchCount];
range.location = (batchIndex-1) * numberOfObjectsPerBatch;
[displayedObjects removeAllObjects];
[displayedObjects addObjectsFromArray:[allObjects
subarrayWithRange:range]];
range.length = (range.location + numberOfObjectsPerBatch > count ?
count - range.location : numberOfObjectsPerBatch);
}
else
{
batchIndex--;
range.location = (batchIndex-1) * numberOfObjectsPerBatch;
range.length = numberOfObjectsPerBatch;
}
[displayedObjects addObjectsFromArray:[allObjects
subarrayWithRange:range]];
}
[self clearSelection];
@ -1908,7 +1933,10 @@ static char rcsId[] = "$Id$";
}
}
else
[displayedObjects addObjectsFromArray:allObjects];
{
batchIndex = [self batchCount];
[self displayNextBatch];
}
if(sortOrdering)
[displayedObjects sortUsingKeyOrderArray:sortOrdering];