Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/8.0.1xx-rc2] Bump iOS version #17807

Merged
merged 1 commit into from
Oct 4, 2023
Merged

[release/8.0.1xx-rc2] Bump iOS version #17807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Core/src/Platform/iOS/LayoutView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public override void WillRemoveSubview(UIView uiview)
Superview?.SetNeedsLayout();
}

public override UIView HitTest(CGPoint point, UIEvent? uievent)
public override UIView? HitTest(CGPoint point, UIEvent? uievent)
{
var result = base.HitTest(point, uievent);

Expand All @@ -31,7 +31,7 @@ public override UIView HitTest(CGPoint point, UIEvent? uievent)
// then we exclude the LayoutView itself from hit testing. But it's children are valid
// hit testing targets.

return null!;
return null;
}

return result!;
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/PublicAPI/net-ios/PublicAPI.Shipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2137,7 +2137,7 @@ override Microsoft.Maui.Platform.ContainerViewController.ViewDidLayoutSubviews()
override Microsoft.Maui.Platform.ContentView.LayoutSubviews() -> void
override Microsoft.Maui.Platform.ContentView.SetNeedsLayout() -> void
override Microsoft.Maui.Platform.ContentView.SizeThatFits(CoreGraphics.CGSize size) -> CoreGraphics.CGSize
override Microsoft.Maui.Platform.LayoutView.HitTest(CoreGraphics.CGPoint point, UIKit.UIEvent? uievent) -> UIKit.UIView!
override Microsoft.Maui.Platform.LayoutView.HitTest(CoreGraphics.CGPoint point, UIKit.UIEvent? uievent) -> UIKit.UIView?
override Microsoft.Maui.Platform.LayoutView.LayoutSubviews() -> void
override Microsoft.Maui.Platform.LayoutView.SetNeedsLayout() -> void
override Microsoft.Maui.Platform.LayoutView.SizeThatFits(CoreGraphics.CGSize size) -> CoreGraphics.CGSize
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2136,7 +2136,7 @@ override Microsoft.Maui.Platform.ContainerViewController.ViewDidLayoutSubviews()
override Microsoft.Maui.Platform.ContentView.LayoutSubviews() -> void
override Microsoft.Maui.Platform.ContentView.SetNeedsLayout() -> void
override Microsoft.Maui.Platform.ContentView.SizeThatFits(CoreGraphics.CGSize size) -> CoreGraphics.CGSize
override Microsoft.Maui.Platform.LayoutView.HitTest(CoreGraphics.CGPoint point, UIKit.UIEvent? uievent) -> UIKit.UIView!
override Microsoft.Maui.Platform.LayoutView.HitTest(CoreGraphics.CGPoint point, UIKit.UIEvent? uievent) -> UIKit.UIView?
override Microsoft.Maui.Platform.LayoutView.LayoutSubviews() -> void
override Microsoft.Maui.Platform.LayoutView.SetNeedsLayout() -> void
override Microsoft.Maui.Platform.LayoutView.SizeThatFits(CoreGraphics.CGSize size) -> CoreGraphics.CGSize
Expand Down