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

Update to use NSTableRowView

Browse source
This commit is contained in:
Gregory John Casamento 2024-04-28 07:17:43 -04:00
parent f7e4b70f54
commit 77ce97c266
2 changed files with 46 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Source/GSThemeDrawing.m
View file

@ -3698,6 +3698,7 @@ static NSDictionary *titleTextAttributes[3] = {nil, nil, nil};
/* Draw the row between startingColumn and endingColumn */
for (i = startingColumn; i <= endingColumn; i++)
{
id rv = [v rowViewAtRow: rowIndex makeIfNecessary: YES];
NSRect drawingRect = [v frameOfCellAtColumn: i
row: rowIndex];
NSTableColumn *tb = [tableColumns objectAtIndex: i];
@ -3753,10 +3754,13 @@ static NSDictionary *titleTextAttributes[3] = {nil, nil, nil};
// Store the object...
[v _setRenderedView: view forPath: path];
[v addSubview: view];
[v addSubview: rv];
[rv addSubview: view];
// Place the view...
[view setFrame: drawingRect];
NSRect newRect = drawingRect;
newRect.origin.y = 0.0;
[view setFrame: newRect];
}
}

48
Source/NSTableView.m
View file

@ -2374,6 +2374,7 @@ static void computeNewSelection
{
[_renderedViewPaths removeAllObjects];
[_pathsToViews removeAllObjects];
[_rowViews removeAllObjects];
}
[self noteNumberOfRowsChanged];
@ -6922,13 +6923,13 @@ For a more detailed explanation, -setSortDescriptors:. */
if (loaded)
{
NSEnumerator *en = [tlo objectEnumerator];
id o = nil;
id v = nil;
while ((o = [en nextObject]) != nil)
while ((v = [en nextObject]) != nil)
{
if ([o isKindOfClass: [NSView class]])
if ([v isKindOfClass: [NSView class]])
{
view = o;
view = v;
break;
}
}
@ -6945,13 +6946,44 @@ For a more detailed explanation, -setSortDescriptors:. */
- (NSTableRowView *) rowViewAtRow: (NSInteger)row makeIfNecessary: (BOOL)flag
{
NSTableRowView *rv = [_rowViews objectAtIndex: row];
NSTableRowView *rv = nil;
if (rv == nil)
if (_viewBased == YES)
{
if (flag == YES)
// NSLog(@"_rowViews = %@", _rowViews);
if (row < [_rowViews count])
{
rv = [[NSTableRowView alloc] init];
rv = [_rowViews objectAtIndex: row];
}
if (rv == nil)
{
if (flag == YES)
{
if ([_delegate respondsToSelector: @selector(tableView:rowViewForRow:)])
{
rv = [_delegate tableView: self rowViewForRow: row];
}
}
if (rv == nil)
{
rv = [[NSTableRowView alloc] init];
}
NSRect cellFrame = [self frameOfCellAtColumn: 0 row: row];
CGFloat x = 0.0; // cellFrame.origin.x;
CGFloat y = cellFrame.origin.y;
CGFloat w = [self frame].size.width;
CGFloat h = [self rowHeight];
NSRect rvFrame = NSMakeRect(x, y, w, h);
NSAutoresizingMaskOptions options = NSViewWidthSizable | NSViewMinYMargin;
[rv setAutoresizingMask: options];
[rv setFrame: rvFrame];
[_rowViews addObject: rv];
}
}