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

Follow Fred's suggested data structure where we manage everything from NSGridView and call back to it from the column and row objects.

Browse source
This commit is contained in:
Gregory John Casamento 2021-02-15 02:33:59 -05:00
parent d97ab132ac
commit f5d86cd623
2 changed files with 32 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Headers/AppKit/NSGridView.h
View file

@ -61,8 +61,8 @@ APPKIT_EXPORT const CGFloat NSGridViewSizeForContent;
@interface NSGridView : NSView
{
NSGridRowAlignment _rowAlignment;
NSMutableArray *_rows;
NSMutableArray *_columns;
NSMutableArray *_rows;
NSMutableArray *_cells;
CGFloat _columnSpacing;
CGFloat _rowSpacing;
@ -152,7 +152,6 @@ APPKIT_EXPORT const CGFloat NSGridViewSizeForContent;
CGFloat _leadingPadding;
CGFloat _trailingPadding;
BOOL _isHidden;
NSMutableArray *_cells;
}
- (NSGridView *) gridView;
- (NSInteger) numberOfCells;
@ -181,7 +180,6 @@ APPKIT_EXPORT const CGFloat NSGridViewSizeForContent;
CGFloat _bottomPadding;
CGFloat _topPadding;
BOOL _isHidden;
NSMutableArray *_cells;
}
- (NSGridView *) gridView;

95
Source/NSGridView.m
View file

@ -26,14 +26,6 @@
#import "AppKit/NSGridView.h"
#import "GSFastEnumeration.h"
@interface NSGridRow (Private)
- (void) _addCell: (NSGridCell *)c;
@end
@interface NSGridColumn (Private)
- (void) _addCell: (NSGridCell *)c;
@end
@implementation NSGridView
+ (void) initialize
@ -86,9 +78,8 @@
if (self != nil)
{
_rows = [[NSMutableArray alloc] initWithCapacity: 10];
_columns = [[NSMutableArray alloc] initWithCapacity: 10];
_cells = [[NSMutableArray alloc] initWithCapacity: 10];
_rows = [[NSGridRow alloc] init];
_columns = [[NSGridColumn alloc] init];
}
[self _refreshCells];
@ -201,10 +192,17 @@
NSGridCell *c = [[NSGridCell alloc] init];
[c setContentView: v];
RELEASE(v);
[gr _addCell: c];
// [gr _addCell: c];
}
END_FOR_IN(views);
// Insert cell into column before the actual row position...
NSUInteger i = 0;
for (i = 0; i < index; i++)
{
NSGridCell *c = [[NSGridCell alloc] init];
}
// Refresh...
[self _refreshCells];
return gr;
@ -426,6 +424,16 @@
[self setVersion: 1];
}
}
- (instancetype) init
{
self = [super init];
if (self != nil)
{
[self setContentView: [[self class] emptyContentView]];
}
return self;
}
- (NSView *) contentView
{
@ -547,13 +555,13 @@
{
_owningRow = [coder decodeObjectForKey: @"NSGrid_owningRow"]; // weak
NSDebugLog(@"_owningRow = %@", _owningRow);
[_owningRow _addCell: self];
// [_owningRow _addCell: self];
}
if ([coder containsValueForKey: @"NSGrid_owningColumn"])
{
_owningColumn = [coder decodeObjectForKey: @"NSGrid_owningColumn"]; // weak
NSDebugLog(@"_owningColumn = %@", _owningColumn);
[_owningColumn _addCell: self];
// [_owningColumn _addCell: self];
}
if ([coder containsValueForKey: @"NSGrid_xPlacement"])
{
@ -573,9 +581,9 @@
[self setContentView: [coder decodeObject]];
ASSIGN(_mergeHead, [coder decodeObject]);
_owningRow = [coder decodeObject]; // weak
[_owningRow _addCell: self];
// [_owningRow _addCell: self];
_owningColumn = [coder decodeObject]; // weak
[_owningRow _addCell: self];
// [_owningRow _addCell: self];
[coder decodeValueOfObjCType: @encode(NSInteger)
at: &_xPlacement];
[coder decodeValueOfObjCType:@encode(NSInteger)
@ -589,6 +597,7 @@
- (void) dealloc
{
RELEASE(_contentView);
RELEASE(_mergeHead);
[super dealloc];
}
@ -606,11 +615,6 @@
}
}
- (void) _addCell: (NSGridCell *)c
{
[_cells addObject: c];
}
- (NSGridView *) gridView
{
return _gridView;
@ -618,12 +622,12 @@
- (NSInteger) numberOfCells
{
return [_cells count];
return 0; // refer to gridView here... [_cells count];
}
- (NSGridCell *) cellAtIndex:(NSInteger)index
{
return [_cells objectAtIndex: index];
return nil; // refer to gridview here... [_cells objectAtIndex: index];
}
- (NSGridCellPlacement) xPlacement
@ -715,7 +719,7 @@
if (self != nil)
{
NSDebugLog(@"%@ %@",NSStringFromClass([self class]), NSStringFromSelector(_cmd));
_cells = [[NSMutableArray alloc] initWithCapacity: 10];
// _cells = [[NSMutableArray alloc] initWithCapacity: 10];
if ([coder allowsKeyedCoding])
{
if ([coder containsValueForKey: @"NSGrid_hidden"])
@ -762,22 +766,6 @@
return self;
}
- (instancetype) init
{
self = [super init];
if (self != nil)
{
_cells = [[NSMutableArray alloc] initWithCapacity: 10];
}
return self;
}
- (void) dealloc
{
RELEASE(_cells);
[super dealloc];
}
@end
/// Row ///
@ -791,11 +779,6 @@
}
}
- (void) _addCell: (NSGridCell *)c
{
[_cells addObject: c];
}
- (void) setGridView: (NSGridView *)gridView
{
_gridView = gridView; // weak reference...
@ -808,12 +791,12 @@
- (NSInteger) numberOfCells
{
return [_cells count];
return 0; // reference gridview here... [_cells count];
}
- (NSGridCell *) cellAtIndex:(NSInteger)index
{
return [_cells objectAtIndex: index];
return nil; // reference gridview here... [_cells objectAtIndex: index];
}
- (NSGridCellPlacement) yPlacement
@ -904,7 +887,7 @@
if (self != nil)
{
NSDebugLog(@"%@ %@",NSStringFromClass([self class]), NSStringFromSelector(_cmd));
_cells = [[NSMutableArray alloc] initWithCapacity: 10];
// _cells = [[NSMutableArray alloc] initWithCapacity: 10];
if ([coder allowsKeyedCoding])
{
if ([coder containsValueForKey: @"NSGrid_hidden"])
@ -951,20 +934,4 @@
return self;
}
- (instancetype) init
{
self = [super init];
if (self != nil)
{
_cells = [[NSMutableArray alloc] initWithCapacity: 10];
}
return self;
}
- (void) dealloc
{
RELEASE(_cells);
[super dealloc];
}
@end