Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

[iOS] Remove popup arrow if anchor isn't set #854

Merged
merged 11 commits into from
Feb 14, 2021
Merged

[iOS] Remove popup arrow if anchor isn't set #854

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
47caba9
Remove popup arrow if anchor isn't set
geskill Feb 7, 2021
a727f40
Create PopoverArrowDirection.cs
geskill Feb 8, 2021
88a6620
Create Popup.shared.cs
geskill Feb 8, 2021
d360836
Add arrow direction platform specific.
geskill Feb 8, 2021
bcc16a5
Add arrow direction platform specific sample.
geskill Feb 8, 2021
cf5273d
Rename PopoverArrowDirection.cs to PopoverArrowDirection.shared.cs
geskill Feb 8, 2021
5a6ef61
Change ArrowDirection to up
geskill Feb 8, 2021
8a5e4fc
Merge pull request #1 from xamarin/develop
geskill Feb 13, 2021
44f7304
Merge
Feb 13, 2021
8576fb2
Remove switch PopoverArrowDirection.None since default is already zero.
Feb 13, 2021
11ea06b
Use div 2 instead of multiply by 0.5 for consistency.
Feb 13, 2021
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
10 changes: 5 additions & 5 deletions src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,25 +148,27 @@ void SetLayout()
{
var originY = Element.VerticalOptions.Alignment switch
{
LayoutAlignment.End => UIScreen.MainScreen.Bounds.Height - PreferredContentSize.Height,
LayoutAlignment.Center => (UIScreen.MainScreen.Bounds.Height / 2) - (PreferredContentSize.Height / 2),
LayoutAlignment.End => UIScreen.MainScreen.Bounds.Height,
LayoutAlignment.Center => UIScreen.MainScreen.Bounds.Height * 0.5,
_ => 0f
};

var originX = Element.HorizontalOptions.Alignment switch
{
LayoutAlignment.End => UIScreen.MainScreen.Bounds.Width,
LayoutAlignment.Center => UIScreen.MainScreen.Bounds.Width / 2,
LayoutAlignment.Center => UIScreen.MainScreen.Bounds.Width * 0.5,
_ => 0f
};

PopoverPresentationController.SourceRect = new CGRect(originX, originY, 0, 0);
PopoverPresentationController.PermittedArrowDirections = 0;
}
else
{
var view = Platform.GetRenderer(Element.Anchor).NativeView;
PopoverPresentationController.SourceView = view;
PopoverPresentationController.SourceRect = view.Bounds;
PopoverPresentationController.PermittedArrowDirections = UIPopoverArrowDirection.Up;
}
}

Expand All @@ -187,8 +189,6 @@ void SetPresentationController()

((UIPopoverPresentationController)PresentationController).SourceView = ViewController.View;

// Setting PermittedArrowDirector to 0 breaks the Popover layout. It would be nice if there is no anchor to remove the arrow.
((UIPopoverPresentationController)PresentationController).PermittedArrowDirections = UIPopoverArrowDirection.Up;
((UIPopoverPresentationController)PresentationController).Delegate = popOverDelegate;
}

Expand Down