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

Fix implementation of initWithViews:

Browse source
This commit is contained in:
Gregory John Casamento 2021-03-22 20:03:46 -04:00
parent ac2e5ff680
commit d818fc42d4
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
Source/NSGridView.m
View file

@ -258,33 +258,36 @@
FOR_IN(NSArray*, row, views)
{
NSArray *columns = [row objectAtIndex: c];
FOR_IN(NSArray*, column, columns)
NSGridRow *gr = [[NSGridRow alloc] init];
[gr setGridView: self];
[_rows addObject: gr];
c = 0;
FOR_IN(NSView*, v, row)
{
NSView *v = [column objectAtIndex: c];
NSGridColumn *gc = nil;
NSGridCell *cell = [[NSGridCell alloc] init];
if (r == 0)
if (r == 0) // first row, create all of the columns...
{
NSGridRow *gr = [[NSGridRow alloc] init];
[gr setGridView: self];
[_rows addObject: gr];
[cell _setOwningRow: gr];
gc = [[NSGridColumn alloc] init];
[_columns addObject: gc];
[gc setGridView: self];
}
else
{
gc = [_columns objectAtIndex: c];
}
if (c == 0)
{
NSGridColumn *gc = [[NSGridColumn alloc] init];
[gc setGridView: self];
[_columns addObject: gc];
[cell _setOwningColumn: gc];
}
[cell _setOwningRow: gr];
[cell _setOwningColumn: gc];
[cell setContentView: v];
[_cells addObject: cell];
c++;
}
END_FOR_IN(columns);
END_FOR_IN(row);
r++;
}
END_FOR_IN(views);
@ -319,6 +322,12 @@
return AUTORELEASE([[self alloc] initWithViews: views]);
}
- (void) setFrame: (NSRect)f
{
[super setFrame: f];
[self _refreshCells];
}
- (NSInteger) numberOfRows
{
return [_rows count];