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

Allow initial activate after a close

This commit is contained in:
Antony Male 2016-01-06 21:19:59 +00:00
parent c3d5cbcbe4
commit 3a6e82557a
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Stylet/Screen.cs
View File

@ -184,6 +184,8 @@ namespace Stylet
((IScreenState)this).Deactivate();
this.View = null;
// Reset, so we can initially activate again
this.haveActivated = false;
this.SetState(ScreenState.Closed, (oldState, newState) =>
{

10
StyletUnitTests/ScreenTests.cs
View File

@ -424,5 +424,15 @@ namespace StyletUnitTests
((IScreenState)this.screen).Activate();
Assert.True(this.screen.OnInitialActivateCalled);
}
[Test]
public void ClosingResetsInitialActivate()
{
((IScreenState)this.screen).Activate();
this.screen.OnInitialActivateCalled = false;
((IScreenState)this.screen).Close();
((IScreenState)this.screen).Activate();
Assert.True(this.screen.OnInitialActivateCalled);
}
}
}