gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-15 09:43:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix resize issue with flow

Browse source
This commit is contained in:
Gregory John Casamento 2022-07-17 10:07:09 -04:00
parent 2246da3d0e
commit 9c1aec70e7
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Source/NSCollectionView.m
View file

@ -1437,14 +1437,9 @@ static NSString *placeholderItem = nil;
NSSize s = _itemSize; NSSize s = _itemSize;
CGFloat h = s.height; CGFloat h = s.height;
CGFloat proposedHeight = ns * h; CGFloat proposedHeight = ns * h;
id sv = [self superview]; id sv = [self superview];
//if ([sv isKindOfClass: [NSClipView class]])
// {
// sv = [sv superview];
// }
NSRect newRect = [sv frame]; NSRect newRect = [sv frame];
if (proposedHeight < newRect.size.height) if (proposedHeight < newRect.size.height)
{ {
proposedHeight = newRect.size.height; proposedHeight = newRect.size.height;
@ -1453,10 +1448,8 @@ static NSString *placeholderItem = nil;
newRect.size.height = proposedHeight; newRect.size.height = proposedHeight;
[self setFrame: newRect]; [self setFrame: newRect];
NSDebugLog(@"reloading data... number of sections = %ld, %@", ns, _collectionViewLayout);
[_visibleItems removeAllObjects]; [_visibleItems removeAllObjects];
[[self subviews] makeObjectsPerformSelector: @selector(removeFromSuperview)]; [self setSubviews: [NSArray array]];
[_collectionViewLayout prepareLayout]; [_collectionViewLayout prepareLayout];
for (cs = 0; cs < ns; cs++) for (cs = 0; cs < ns; cs++)
{ {

13
Source/NSCollectionViewFlowLayout.m
View file

@ -29,6 +29,17 @@
#import "GSGuiPrivate.h" #import "GSGuiPrivate.h"
@interface NSCollectionView (__FlowLayoutPrivate__)
- (void) _setFrameWithoutTile: (NSRect)f;
@end
@implementation NSCollectionView (__FlowLayoutPrivate__)
- (void) _setFrameWithoutTile: (NSRect)f
{
_frame = f;
}
@end
@implementation NSCollectionViewFlowLayoutInvalidationContext @implementation NSCollectionViewFlowLayoutInvalidationContext
- (instancetype) init - (instancetype) init
@ -448,7 +459,7 @@
if (y + h > vf.size.height) if (y + h > vf.size.height)
{ {
vf.size.height = y + h; vf.size.height = y + h;
// [_collectionView setFrame: vf]; [_collectionView _setFrameWithoutTile: vf];
} }
// Build attrs object... // Build attrs object...