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

Fix issues mentioned by @fredkiefer in review, remove check in NSViewController

Browse source
This commit is contained in:
Gregory John Casamento 2023-02-07 21:27:39 -05:00
parent d6d2f430ad
commit 4bcdf6f5d4
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Source/NSCollectionView.m
View file

@ -71,7 +71,7 @@ APPKIT_DECLARE NSCollectionViewSupplementaryElementKind GSNoSupplementaryElement
* Private helper macro to check, if the method given via the selector sel
* has been overridden in the current subclass.
*/
#define OVERRIDDEN(sel) ([self methodForSelector: @selector(sel)] != [[_collectionViewLayout class] instanceMethodForSelector: @selector(sel)])
#define OVERRIDDEN(sel) ([_collectionViewLayout methodForSelector: @selector(sel)] != [[_collectionViewLayout class] instanceMethodForSelector: @selector(sel)])
/*
* Class variables
@ -771,7 +771,7 @@ static NSString *_placeholderItem = nil;
[self reloadData];
return;
}
if (!_items)
return;
@ -798,16 +798,16 @@ static NSString *_placeholderItem = nil;
if (remaining > 0 && itemSize.width < _maxItemSize.width)
{
itemSize.width = MIN(_maxItemSize.width, itemSize.width +
itemSize.width = MIN(_maxItemSize.width, itemSize.width +
floor(remaining / _numberOfColumns));
}
if (_maxNumberOfColumns == 1 && itemSize.width <
if (_maxNumberOfColumns == 1 && itemSize.width <
_maxItemSize.width && itemSize.width < width)
{
itemSize.width = MIN(_maxItemSize.width, width);
}
if (!NSEqualSizes(_itemSize, itemSize))
{
_itemSize = itemSize;
@ -820,7 +820,7 @@ static NSString *_placeholderItem = nil;
{
count = MIN(count, _maxNumberOfColumns * _maxNumberOfRows);
}
_horizontalMargin = floor((width - _numberOfColumns * itemSize.width) /
(_numberOfColumns + 1));
CGFloat y = -itemSize.height;

11
Source/NSViewController.m
View file

@ -132,11 +132,7 @@
return;
}
if ([self respondsToSelector: @selector(viewWillLoad)])
{
[self viewWillLoad];
}
[self viewWillLoad];
nib = [[NSNib alloc] initWithNibNamed: [self nibName]
bundle: [self nibBundle]];
if ((nib != nil) && [nib instantiateNibWithOwner: self
@ -144,10 +140,7 @@
{
_vcFlags.nib_is_loaded = YES;
// FIXME: Need to resolve possible retain cycles here
if ([self respondsToSelector: @selector(viewDidLoad)])
{
[self viewWillLoad];
}
[self viewDidLoad];
}
else
{