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

Navigate with RootFrame instead

Browse source
This commit is contained in:
Eric Tian 2021-04-10 17:34:57 -07:00
commit 0873be2f6b
5 changed files with 22 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Calculator/SettingsPage.xaml
View file

@ -20,15 +20,21 @@
<ScrollViewer>
<Grid x:Name="PageGrid" AutomationProperties.LandmarkType="Main">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="1*"
MinHeight="{StaticResource HamburgerHeight}"
MaxHeight="52"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Grid>
<local:TitleBar/>
</Grid>
<Grid Height="{StaticResource HamburgerHeight}"
HorizontalAlignment="Left"
VerticalAlignment="Top">
VerticalAlignment="Top"
Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="{StaticResource HamburgerHeightGridLength}"/>
<ColumnDefinition Width="Auto"/>
@ -37,6 +43,7 @@
<Button x:Name="BackButton"
x:Uid="BackButton"
Style="{StaticResource NavigationBackButtonNormalStyle}"
Grid.Row="1"
Click="BackButtonClick"/>
<TextBlock x:Uid="SettingsHeader"
@ -47,7 +54,7 @@
Style="{StaticResource CategoryNameTextBlockStyle}"/>
</Grid>
<StackPanel Grid.Row="1" Margin="12,0,12,0">
<StackPanel Grid.Row="2" Margin="12,0,12,0">
<StackPanel x:Name="SettingsStack"
AutomationProperties.LabeledBy="{Binding ElementName=SettingsAppTheme}"
Orientation="Vertical">

13
src/Calculator/SettingsPage.xaml.cpp
View file

@ -95,15 +95,6 @@ SettingsPage::SettingsPage()
}
}
void SettingsPage::OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs ^ e)
{
MainPage ^ mainPage = dynamic_cast<MainPage ^> (e->Parameter);
if (mainPage != nullptr)
{
MainPageProperty = mainPage;
}
}
void SettingsPage::SetDefaultFocus()
{
SettingsLightTheme->Focus(::FocusState::Programmatic);
@ -139,6 +130,8 @@ void SettingsPage::InitializeContributeTextBlock()
void SettingsPage::BackButtonClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e)
{
auto rootFrame = dynamic_cast<::Frame ^>(Window::Current->Content);
if (SettingsRestartApp->Visibility == ::Visibility::Visible)
{
Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"restartApp", L"True");
@ -147,7 +140,7 @@ void SettingsPage::BackButtonClick(Platform::Object ^ sender, Windows::UI::Xaml:
{
Windows::Storage::ApplicationData::Current->LocalSettings->Values->Insert(L"restartApp", L"False");
}
MainPageProperty->CollapseSettings();
rootFrame->Navigate((MainPage::typeid), this);
}
void SettingsPage::SetVersionString()

3
src/Calculator/SettingsPage.xaml.h
View file

@ -15,9 +15,6 @@ namespace CalculatorApp
SettingsPage();
property MainPage ^ MainPageProperty;
protected:
virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs ^ e) override;
private:
void SetDefaultFocus();
void InitializeContributeTextBlock();

12
src/Calculator/Views/MainPage.xaml.cpp
View file

@ -383,10 +383,8 @@ void MainPage::EnsureConverter()
void MainPage::EnsureSettings()
{
SettingsHolder->Navigate((SettingsPage::typeid), this);
SettingsHolder->Visibility = ::Visibility::Visible;
NavView->IsPaneOpen = false;
NavView->Visibility = ::Visibility::Collapsed;
auto rootFrame = dynamic_cast<::Frame ^>(Window::Current->Content);
rootFrame->Navigate((SettingsPage::typeid), this);
}
void MainPage::OnNavLoaded(_In_ Object ^ sender, _In_ RoutedEventArgs ^ e)
@ -449,12 +447,6 @@ void MainPage::OnSettingsButtonKeyDown(Object ^ sender, KeyRoutedEventArgs ^ e)
}
}
void MainPage::CollapseSettings()
{
SettingsHolder->Visibility = ::Visibility::Collapsed;
NavView->Visibility = ::Visibility::Visible;
}
void MainPage::OnNavSelectionChanged(_In_ Object ^ sender, _In_ MUXC::NavigationViewSelectionChangedEventArgs ^ e)
{
auto item = dynamic_cast<MUXC::NavigationViewItem ^>(e->SelectedItemContainer);

2
src/Calculator/Views/MainPage.xaml.h
View file

@ -39,8 +39,6 @@ public
Platform::Object
^> ^ CreateUIElementsForCategories(_In_ Windows::Foundation::Collections::IObservableVector<CalculatorApp::Common::NavCategoryGroup ^> ^ categories);
void CollapseSettings();
protected:
void OnNavigatedTo(_In_ Windows::UI::Xaml::Navigation::NavigationEventArgs ^ e) override;