AMT-Cheif
/
Stylet
mirror of https://github.com/AMT-Cheif/Stylet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect use of WeakEventManager in ScreenExtensions

This commit is contained in:
Antony Male 2015-02-09 12:16:25 +00:00
parent 91b925a458
commit 02175b6e67
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Stylet/ScreenExtensions.cs
View File

@ -60,7 +60,17 @@ namespace Stylet
/// <param name="parent">Parent to observe</param> /// <param name="parent">Parent to observe</param>
public static void ActivateWith(this IScreenState child, IScreenState parent) public static void ActivateWith(this IScreenState child, IScreenState parent)
{ {
WeakEventManager<IScreenState, ActivationEventArgs>.AddHandler(parent, "Activated", (o, e) => child.Activate()); var weakChild = new WeakReference<IScreenState>(child);
EventHandler<ActivationEventArgs> handler = null;
handler = (o, e) =>
{
IScreenState strongChild;
if (weakChild.TryGetTarget(out strongChild))
strongChild.Activate();
else
parent.Activated -= handler;
};
parent.Activated += handler;
} }
/// <summary> /// <summary>
@ -71,7 +81,17 @@ namespace Stylet
/// <param name="parent">Parent to observe</param> /// <param name="parent">Parent to observe</param>
public static void DeactivateWith(this IScreenState child, IScreenState parent) public static void DeactivateWith(this IScreenState child, IScreenState parent)
{ {
WeakEventManager<IScreenState, DeactivationEventArgs>.AddHandler(parent, "Deactivated", (o, e) => child.Deactivate()); var weakChild = new WeakReference<IScreenState>(child);
EventHandler<DeactivationEventArgs> handler = null;
handler = (o, e) =>
{
IScreenState strongChild;
if (weakChild.TryGetTarget(out strongChild))
strongChild.Deactivate();
else
parent.Deactivated -= handler;
};
parent.Deactivated += handler;
} }
/// <summary> /// <summary>
@ -82,8 +102,17 @@ namespace Stylet
/// <param name="parent">Parent to observe</param> /// <param name="parent">Parent to observe</param>
public static void CloseWith(this IScreenState child, IScreenState parent) public static void CloseWith(this IScreenState child, IScreenState parent)
{ {
// Using TryCloseAndDispose ensures that Dispose is called if necessary var weakChild = new WeakReference<IScreenState>(child);
WeakEventManager<IScreenState, CloseEventArgs>.AddHandler(parent, "Closed", (o, e) => TryClose(child)); EventHandler<CloseEventArgs> handler = null;
handler = (o, e) =>
{
IScreenState strongChild;
if (weakChild.TryGetTarget(out strongChild))
TryClose(strongChild);
else
parent.Closed -= handler;
};
parent.Closed += handler;
} }
/// <summary> /// <summary>