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

Fix issue with view refresh/editability, refactor so that view sizing happens in the correct place

Browse source
This commit is contained in:
Gregory John Casamento 2024-05-03 10:40:08 -04:00
parent bec2392e33
commit b7bea0213b
2 changed files with 43 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
Source/GSThemeDrawing.m
View file

@ -3632,13 +3632,13 @@ static NSDictionary *titleTextAttributes[3] = {nil, nil, nil};
- (void) drawCellViewRow: (NSInteger)rowIndex
clipRect: (NSRect)clipRect
inView: (NSTableView *)tv
inView: (NSTableView *)tableView
{
NSInteger numberOfRows = [tv numberOfRows];
NSInteger numberOfRows = [tableView numberOfRows];
NSInteger startingColumn;
NSInteger endingColumn;
NSInteger columnIndex;
id dataSource = [tv dataSource];
id dataSource = [tableView dataSource];
// If we have no data source, there is nothing to do...
if (dataSource == nil)
@ -3654,23 +3654,50 @@ static NSDictionary *titleTextAttributes[3] = {nil, nil, nil};
[self _calculatedStartingColumn: &startingColumn
endingColumn: &endingColumn
withTableView: tv
withTableView: tableView
inClipRect: clipRect];
/* Draw the row between startingColumn and endingColumn */
for (columnIndex = startingColumn; columnIndex <= endingColumn; columnIndex++)
{
id rowView = [tv rowViewAtRow: rowIndex makeIfNecessary: YES];
NSView *view = [tv viewAtColumn: columnIndex row: rowIndex makeIfNecessary: YES];
// Store the object...
[tv addSubview: rowView];
[rowView addSubview: view];
// Place the view...
NSRect newRect = [view frame];
newRect.origin.y = 0.0;
[view setFrame: newRect];
id rowView = [tableView rowViewAtRow: rowIndex
makeIfNecessary: YES];
NSView *view = [tableView viewAtColumn: columnIndex
row: rowIndex
makeIfNecessary: YES];
// If the view is already part of the table, don't re-add it...
if ([[tableView subviews] containsObject: rowView] == NO
&& rowView != nil)
{
NSRect cellFrame = [tableView frameOfCellAtColumn: 0
row: rowIndex];
CGFloat x = 0.0;
CGFloat y = cellFrame.origin.y;
CGFloat w = [tableView frame].size.width;
CGFloat h = [tableView rowHeight];
NSRect rvFrame = NSMakeRect(x, y, w, h);
NSAutoresizingMaskOptions options = NSViewWidthSizable
| NSViewMinYMargin;
[tableView addSubview: rowView];
[rowView setAutoresizingMask: options];
[rowView setFrame: rvFrame];
}
// Create the view if needed...
if ([[rowView subviews] containsObject: view] == NO
&& view != nil)
{
// Add the view to the row...
[rowView addSubview: view];
// Place the view...
NSRect newRect = [view frame];
newRect.origin.y = 0.0;
[view setFrame: newRect];
}
}
}

13
Source/NSTableView.m
View file

@ -6990,18 +6990,6 @@ For a more detailed explanation, -setSortDescriptors:. */
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];
}
}
@ -7035,6 +7023,7 @@ For a more detailed explanation, -setSortDescriptors:. */
}
}
// [view setPostsFrameChangedNotifications: NO];
[view setFrame: drawingRect];
[self _setRenderedView: view forPath: path];