Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6965 from Dhilan007/v3-wp8fix 

Support Fast App Resume and fixed black screen may arise when using third sdk.
This commit is contained in:
minggo 2014-06-04 17:15:13 +08:00
parent a495747a7c 3fcb75c82f
commit 7a4d46dc1b
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
templates/cpp-template-default/proj.wp8-xaml/HelloCpp/App.xaml.cs
View File

@ -140,12 +140,36 @@ namespace PhoneDirect3DXamlAppInterop
RootFrame.Navigated -= CompleteInitializePhoneApplication; RootFrame.Navigated -= CompleteInitializePhoneApplication;
} }
private bool _isResume = false;
private void CheckForResetNavigation(object sender, NavigationEventArgs e) private void CheckForResetNavigation(object sender, NavigationEventArgs e)
{ {
// If the app has received a 'reset' navigation, then we need to check
// on the next navigation to see if the page stack should be reset
if (e.NavigationMode == NavigationMode.Reset) if (e.NavigationMode == NavigationMode.Reset)
{
RootFrame.Navigating += HandlerFotResetNavigating;
_isResume = true;
}
else
{
if (_isResume && e.NavigationMode == NavigationMode.Refresh)
{
RootFrame.Navigating -= HandlerFotResetNavigating;
_isResume = false;
}
}
}
private void HandlerFotResetNavigating(object sender, NavigatingCancelEventArgs e)
{
RootFrame.Navigating -= HandlerFotResetNavigating;
if (e.Uri.OriginalString.Contains("MainPage.xaml"))
{
e.Cancel = true;
}
else
{
RootFrame.Navigated += ClearBackStackAfterReset; RootFrame.Navigated += ClearBackStackAfterReset;
}
_isResume = false;
} }
private void ClearBackStackAfterReset(object sender, NavigationEventArgs e) private void ClearBackStackAfterReset(object sender, NavigationEventArgs e)

2
templates/cpp-template-default/proj.wp8-xaml/HelloCpp/Properties/WMAppManifest.xml
View File

@ -11,7 +11,7 @@
<Capability Name="ID_CAP_WEBBROWSERCOMPONENT"/> <Capability Name="ID_CAP_WEBBROWSERCOMPONENT"/>
</Capabilities> </Capabilities>
<Tasks> <Tasks>
<DefaultTask Name="_default" NavigationPage="MainPage.xaml" /> <DefaultTask Name="_default" NavigationPage="MainPage.xaml" ActivationPolicy="Resume"/>
</Tasks> </Tasks>
<Tokens> <Tokens>
<PrimaryToken TokenID="PhoneDirect3DXamlAppInteropToken" TaskName="_default"> <PrimaryToken TokenID="PhoneDirect3DXamlAppInteropToken" TaskName="_default">

2
tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Properties/WMAppManifest.xml
View File

@ -11,7 +11,7 @@
<Capability Name="ID_CAP_WEBBROWSERCOMPONENT"/> <Capability Name="ID_CAP_WEBBROWSERCOMPONENT"/>
</Capabilities> </Capabilities>
<Tasks> <Tasks>
<DefaultTask Name="_default" NavigationPage="MainPage.xaml" /> <DefaultTask Name="_default" NavigationPage="MainPage.xaml" ActivationPolicy="Resume"/>
</Tasks> </Tasks>
<Tokens> <Tokens>
<PrimaryToken TokenID="PhoneDirect3DXamlAppInteropToken" TaskName="_default"> <PrimaryToken TokenID="PhoneDirect3DXamlAppInteropToken" TaskName="_default">

2
tests/cpp-tests/proj.wp8-xaml/cpp-tests/Properties/WMAppManifest.xml
View File

@ -11,7 +11,7 @@
<Capability Name="ID_CAP_WEBBROWSERCOMPONENT" /> <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
</Capabilities> </Capabilities>
<Tasks> <Tasks>
<DefaultTask Name="_default" NavigationPage="MainPage.xaml" /> <DefaultTask Name="_default" NavigationPage="MainPage.xaml" ActivationPolicy="Resume"/>
</Tasks> </Tasks>
<Tokens> <Tokens>
<PrimaryToken TokenID="PhoneDirect3DXamlAppInteropToken" TaskName="_default"> <PrimaryToken TokenID="PhoneDirect3DXamlAppInteropToken" TaskName="_default">