github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-23 06:25:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[iOS] Misc fixes

Browse source
This commit is contained in:
David Oliver 2019-05-18 22:05:43 -04:00
commit 4a84523351
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Calculator.Shared/App.xaml.cs
View file

@ -106,7 +106,11 @@ namespace CalculatorApp
public static string GetAppViewState() public static string GetAppViewState()
{ {
String newViewState; String newViewState;
#if NETFX_CORE
CoreWindow window = CoreWindow.GetForCurrentThread(); CoreWindow window = CoreWindow.GetForCurrentThread();
#else
var window = Windows.UI.Xaml.Window.Current;
#endif
if ((window.Bounds.Width >= 560) && (window.Bounds.Height >= 356)) if ((window.Bounds.Width >= 560) && (window.Bounds.Height >= 356))
{ {
newViewState = ViewState.DockedView; newViewState = ViewState.DockedView;

2
src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs
View file

@ -573,7 +573,7 @@ namespace CalculatorApp.ViewModel
m_decimalSeparator = LocalizationSettings.GetInstance().GetDecimalSeparator(); m_decimalSeparator = LocalizationSettings.GetInstance().GetDecimalSeparator();
#if !__WASM__ #if !__WASM__ && !__IOS__
if (CoreWindow.GetForCurrentThread() != null) if (CoreWindow.GetForCurrentThread() != null)
{ {
// Must have a CoreWindow to access the resource context. // Must have a CoreWindow to access the resource context.