Correctly limit SwiftUI image controller size and observe preferredContentSize for changes

LeoNatan · LeoNatan · commit 6e3aaf251f0c · 2025-03-17T00:29:49.000+02:00
Closes #597
diff --git a/LNPopupController/LNPopupController/Private/LNPopupBar.mm b/LNPopupController/LNPopupController/Private/LNPopupBar.mm
@@ -1121,11 +1121,14 @@ - (void)setSwiftuiImageController:(UIViewController *)swiftuiImageController
 	if(_swiftuiImageController != nil)
 	{
 		[_swiftuiImageController.view removeFromSuperview];
+		[_swiftuiImageController removeObserver:self forKeyPath:@"preferredContentSize"];
 	}
 	
 	_swiftuiImageController = swiftuiImageController;
 	if(_swiftuiImageController != nil)
 	{
+		[_swiftuiImageController addObserver:self forKeyPath:@"preferredContentSize" options:NSKeyValueObservingOptionNew context:NULL];
+		
 		_swiftuiImageController.view.backgroundColor = UIColor.clearColor;
 		
 		_swiftuiImageController.view.translatesAutoresizingMaskIntoConstraints = NO;
@@ -1816,7 +1819,7 @@ - (CGSize)_imageViewSizeWithMaxWidth:(CGFloat)width maxHeight:(CGFloat)height
 	
 	if(_swiftuiImageController != nil)
 	{
-		return _swiftuiImageController.preferredContentSize;
+		return LNMakeSizeWithAspectRatioInsideSize(_swiftuiImageController.preferredContentSize, CGSizeMake(width, height));
 	}
 	
 	if(_imageView.contentMode != UIViewContentModeScaleAspectFit)
@@ -1951,6 +1954,12 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 	{
 		[self._barDelegate _popupBarMetricsDidChange:self];
 	}
+	
+	if([keyPath isEqualToString:@"preferredContentSize"] == YES && object == _swiftuiImageController)
+	{
+		[self _layoutImageView];
+		[self _setNeedsTitleLayoutRemovingLabels:NO];
+	}
 }
 
 - (void)setCustomBarViewController:(LNPopupCustomBarViewController*)customBarViewController

Original file line number	Diff line number	Diff line change
`@@ -1121,11 +1121,14 @@ - (void)setSwiftuiImageController:(UIViewController *)swiftuiImageController`
`1121`	`1121`	`if(_swiftuiImageController != nil)`
`1122`	`1122`	`{`
`1123`	`1123`	`[_swiftuiImageController.view removeFromSuperview];`
	`1124`	`+ [_swiftuiImageController removeObserver:self forKeyPath:@"preferredContentSize"];`
`1124`	`1125`	`}`
`1125`	`1126`
`1126`	`1127`	`_swiftuiImageController = swiftuiImageController;`
`1127`	`1128`	`if(_swiftuiImageController != nil)`
`1128`	`1129`	`{`
	`1130`	`+ [_swiftuiImageController addObserver:self forKeyPath:@"preferredContentSize" options:NSKeyValueObservingOptionNew context:NULL];`
	`1131`	`+`
`1129`	`1132`	`_swiftuiImageController.view.backgroundColor = UIColor.clearColor;`
`1130`	`1133`
`1131`	`1134`	`_swiftuiImageController.view.translatesAutoresizingMaskIntoConstraints = NO;`
`@@ -1816,7 +1819,7 @@ - (CGSize)_imageViewSizeWithMaxWidth:(CGFloat)width maxHeight:(CGFloat)height`
`1816`	`1819`
`1817`	`1820`	`if(_swiftuiImageController != nil)`
`1818`	`1821`	`{`
`1819`		`- return _swiftuiImageController.preferredContentSize;`
	`1822`	`+ return LNMakeSizeWithAspectRatioInsideSize(_swiftuiImageController.preferredContentSize, CGSizeMake(width, height));`
`1820`	`1823`	`}`
`1821`	`1824`
`1822`	`1825`	`if(_imageView.contentMode != UIViewContentModeScaleAspectFit)`
`@@ -1951,6 +1954,12 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N`
`1951`	`1954`	`{`
`1952`	`1955`	`[self._barDelegate _popupBarMetricsDidChange:self];`
`1953`	`1956`	`}`
	`1957`	`+`
	`1958`	`+ if([keyPath isEqualToString:@"preferredContentSize"] == YES && object == _swiftuiImageController)`
	`1959`	`+ {`
	`1960`	`+ [self _layoutImageView];`
	`1961`	`+ [self _setNeedsTitleLayoutRemovingLabels:NO];`
	`1962`	`+ }`
`1954`	`1963`	`}`
`1955`	`1964`
`1956`	`1965`	`- (void)setCustomBarViewController:(LNPopupCustomBarViewController*)customBarViewController`