Skip to content

[ios] fix memory leak in GraphicsView #16605

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

Merged
merged 1 commit into from
Aug 9, 2023
Merged

[ios] fix memory leak in GraphicsView #16605

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
2 changes: 2 additions & 0 deletions src/Controls/tests/DeviceTests/Memory/MemoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ void SetupBuilder()
handlers.AddHandler<CheckBox, CheckBoxHandler>();
handlers.AddHandler<Entry, EntryHandler>();
handlers.AddHandler<Editor, EditorHandler>();
handlers.AddHandler<GraphicsView, GraphicsViewHandler>();
handlers.AddHandler<Label, LabelHandler>();
handlers.AddHandler<IContentView, ContentViewHandler>();
handlers.AddHandler<Image, ImageHandler>();
Expand All @@ -34,6 +35,7 @@ void SetupBuilder()
[InlineData(typeof(CheckBox))]
[InlineData(typeof(Entry))]
[InlineData(typeof(Editor))]
[InlineData(typeof(GraphicsView))]
[InlineData(typeof(Image))]
[InlineData(typeof(Label))]
[InlineData(typeof(RefreshView))]
Expand Down
75 changes: 51 additions & 24 deletions src/Core/src/Platform/iOS/PlatformTouchGraphicsView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ namespace Microsoft.Maui.Platform
{
public class PlatformTouchGraphicsView : PlatformGraphicsView
{
IGraphicsView? _graphicsView;
readonly UIHoverGestureRecognizerProxy _proxy;
WeakReference<IGraphicsView>? _graphicsView;
UIHoverGestureRecognizer? _hoverGesture;
RectF _rect;
bool _pressedContained = false;

public PlatformTouchGraphicsView()
{
_proxy = new(this);
Opaque = false;
BackgroundColor = null;
}
Expand All @@ -27,10 +29,10 @@ public override void LayoutSubviews()

public void Connect(IGraphicsView graphicsView)
{
_graphicsView = graphicsView;
_graphicsView = new(graphicsView);

if (OperatingSystem.IsIOSVersionAtLeast(13))
AddGestureRecognizer(_hoverGesture = new UIHoverGestureRecognizer(OnHover));
AddGestureRecognizer(_hoverGesture = new UIHoverGestureRecognizer(_proxy.OnHover));
}

public void Disconnect()
Expand All @@ -40,44 +42,69 @@ public void Disconnect()
_graphicsView = null;
}

void OnHover()
{
if (_hoverGesture!.State == UIGestureRecognizerState.Began)
{
var touch = _hoverGesture.LocationInView(this);
_graphicsView?.StartHoverInteraction(new[] { (PointF)touch.ToPoint() });
}
else if (_hoverGesture.State == UIGestureRecognizerState.Changed)
{
var touch = _hoverGesture.LocationInView(this);
_graphicsView?.MoveHoverInteraction(new[] { (PointF)touch.ToPoint() });
}
else
_graphicsView?.EndHoverInteraction();
}

public override void TouchesBegan(NSSet touches, UIEvent? evt)
{
if (_graphicsView is null || !_graphicsView.TryGetTarget(out var graphicsView))
return;
if (!IsFirstResponder)
BecomeFirstResponder();
var viewPoints = this.GetPointsInView(evt);
_graphicsView?.StartInteraction(viewPoints);
graphicsView.StartInteraction(viewPoints);
_pressedContained = true;
}

public override void TouchesMoved(NSSet touches, UIEvent? evt)
{
if (_graphicsView is null || !_graphicsView.TryGetTarget(out var graphicsView))
return;
var viewPoints = this.GetPointsInView(evt);
_pressedContained = _rect.ContainsAny(viewPoints);
_graphicsView?.DragInteraction(viewPoints);
graphicsView.DragInteraction(viewPoints);
}

public override void TouchesEnded(NSSet touches, UIEvent? evt)
{
if (_graphicsView is null || !_graphicsView.TryGetTarget(out var graphicsView))
return;
graphicsView.EndInteraction(this.GetPointsInView(evt), _pressedContained);
}
public override void TouchesEnded(NSSet touches, UIEvent? evt) =>
_graphicsView?.EndInteraction(this.GetPointsInView(evt), _pressedContained);

public override void TouchesCancelled(NSSet touches, UIEvent? evt)
{
if (_graphicsView is null || !_graphicsView.TryGetTarget(out var graphicsView))
return;
_pressedContained = false;
_graphicsView?.CancelInteraction();
graphicsView.CancelInteraction();
}

class UIHoverGestureRecognizerProxy
{
readonly WeakReference<PlatformTouchGraphicsView> _platformView;

public UIHoverGestureRecognizerProxy(PlatformTouchGraphicsView platformView) => _platformView = new(platformView);

public void OnHover()
{
if (!_platformView.TryGetTarget(out var platformView))
return;

if (platformView._graphicsView is null || !platformView._graphicsView.TryGetTarget(out var graphicsView))
return;

var hoverGesture = platformView._hoverGesture;
if (hoverGesture!.State == UIGestureRecognizerState.Began)
{
var touch = hoverGesture.LocationInView(platformView);
graphicsView.StartHoverInteraction(new[] { (PointF)touch.ToPoint() });
}
else if (hoverGesture.State == UIGestureRecognizerState.Changed)
{
var touch = hoverGesture.LocationInView(platformView);
graphicsView.MoveHoverInteraction(new[] { (PointF)touch.ToPoint() });
}
else
graphicsView.EndHoverInteraction();
}
}
}
}