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

Implement re-flow when view is resized

Browse source
This commit is contained in:
Gregory John Casamento 2022-07-17 08:32:29 -04:00
parent b28eaac9eb
commit 2246da3d0e
3 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Headers/AppKit/NSCollectionViewFlowLayout.h
View file

@ -100,6 +100,10 @@ NSCollectionViewSupplementaryElementKind const NSCollectionElementKindSectionFoo
BOOL _sectionHeadersPinToVisibleBounds;
BOOL _sectionFootersPinToVisibleBounds;
NSMutableIndexSet *_collapsedSections;
NSInteger _ds; // deltas for when overflow happens...
NSInteger _dr;
}
- (CGFloat) minimumLineSpacing;

1
Source/NSCollectionView.m
View file

@ -1456,6 +1456,7 @@ static NSString *placeholderItem = nil;
NSDebugLog(@"reloading data... number of sections = %ld, %@", ns, _collectionViewLayout);
[_visibleItems removeAllObjects];
[[self subviews] makeObjectsPerformSelector: @selector(removeFromSuperview)];
[_collectionViewLayout prepareLayout];
for (cs = 0; cs < ns; cs++)
{

29
Source/NSCollectionViewFlowLayout.m
View file

@ -357,6 +357,8 @@
- (void) prepareLayout
{
[super prepareLayout];
_ds = 0;
_dr = 0;
}
- (NSArray *) layoutAttributesForElementsInRect: (NSRect)rect
@ -366,16 +368,17 @@
- (NSCollectionViewLayoutAttributes *) layoutAttributesForItemAtIndexPath: (NSIndexPath *)indexPath
{
NSCollectionViewLayoutAttributes *attrs = [[NSCollectionViewLayoutAttributes alloc] init];
NSCollectionViewLayoutAttributes *attrs = AUTORELEASE([[NSCollectionViewLayoutAttributes alloc] init]);
NSSize sz = NSZeroSize;
id <NSCollectionViewDelegateFlowLayout> d = (id <NSCollectionViewDelegateFlowLayout>)[_collectionView delegate];
NSInteger s = [indexPath section];
NSInteger r = [indexPath item];
NSInteger s = [indexPath section]; // + _ds;
NSInteger r = [indexPath item]; // + _dr;
NSEdgeInsets si;
CGFloat mls = 0.0;
CGFloat mis = 0.0;
CGFloat h = 0.0, w = 0.0, x = 0.0, y = 0.0;
NSRect f = NSZeroRect;
NSRect vf = [_collectionView frame];
// Item size...
if ([d respondsToSelector: @selector(collectionView:layout:sizeForItemAtIndexPath:)])
@ -430,15 +433,29 @@
w = sz.width;
x = (r * w) + si.left + mis;
y = (s * h) + si.top + mls;
f = NSMakeRect(x, y, h, w);
f = NSMakeRect(x, y, w, h);
// Determine if it is needed to reflow the given element...
if ((x + w) > (vf.size.width - w))
{
_ds += 1;
x = si.left + mis;
y = ((s + _ds) * h) + si.top + mls;
f = NSMakeRect(x, y, w, h);
}
// Resize parent view...
if (y + h > vf.size.height)
{
vf.size.height = y + h;
// [_collectionView setFrame: vf];
}
// Build attrs object...
[attrs setFrame: f];
[attrs setHidden: NO];
[attrs setZIndex: 0];
[attrs setSize: sz];
AUTORELEASE(attrs);
return attrs;
}