DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update WinUI Version to 2.4 (#1354)

Browse Source 
* Updated to WinUI2.4 and fixed NavMenu about flyout and Dark Mode EquationEditBox

* Added updated equationbox background to the focusederror state
This commit is contained in:
Stephanie Anderl 2020-09-01 16:48:22 -07:00 committed by GitHub
parent 5336079e32
commit 503c27ae7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 31 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Calculator.sln
View File

@ -195,6 +195,9 @@ Global
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{311E866D-8B93-4609-A691-265941FEE101} = {3A5DF651-B8A1-45CA-9135-964A6FC7F5D1}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0EA53F83-5FA6-46A1-A290-A3C6962D2CAC} SolutionGuid = {0EA53F83-5FA6-46A1-A290-A3C6962D2CAC}
EndGlobalSection EndGlobalSection

2
src/Calculator/App.xaml
View File

@ -1691,7 +1691,7 @@
<VisualState x:Name="Focused"> <VisualState x:Name="Focused">
<Storyboard> <Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter" Storyboard.TargetProperty="Foreground"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlPlaceholderForegroundFocused}"/> <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlPlaceholderForeground}"/>
</ObjectAnimationUsingKeyFrames> </ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="Background"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="Background">
<DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/> <DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/>

4
src/Calculator/Calculator.vcxproj
View File

@ -955,7 +955,7 @@
</Target> </Target>
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets" Condition="Exists('..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets')" /> <Import Project="..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets" Condition="Exists('..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets')" />
<Import Project="..\..\packages\Microsoft.UI.Xaml.2.3.200213001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\packages\Microsoft.UI.Xaml.2.3.200213001\build\native\Microsoft.UI.Xaml.targets')" /> <Import Project="..\..\packages\Microsoft.UI.Xaml.2.4.3\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\packages\Microsoft.UI.Xaml.2.4.3\build\native\Microsoft.UI.Xaml.targets')" />
</ImportGroup> </ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
@ -963,6 +963,6 @@
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.props'))" /> <Error Condition="!Exists('..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.props'))" />
<Error Condition="!Exists('..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets'))" /> <Error Condition="!Exists('..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets'))" />
<Error Condition="!Exists('..\..\packages\Microsoft.UI.Xaml.2.3.200213001\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.UI.Xaml.2.3.200213001\build\native\Microsoft.UI.Xaml.targets'))" /> <Error Condition="!Exists('..\..\packages\Microsoft.UI.Xaml.2.4.3\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.UI.Xaml.2.4.3\build\native\Microsoft.UI.Xaml.targets'))" />
</Target> </Target>
</Project> </Project>

33
src/Calculator/Calculator.vcxproj.filters
View File

@ -519,7 +519,6 @@
<Page Include="Views\GraphingCalculator\GraphingNumPad.xaml"> <Page Include="Views\GraphingCalculator\GraphingNumPad.xaml">
<Filter>Views\GraphingCalculator</Filter> <Filter>Views\GraphingCalculator</Filter>
</Page> </Page>
<Page Include="Controls\PreviewTagControl.xaml" />
<Page Include="EquationStylePanelControl.xaml" /> <Page Include="EquationStylePanelControl.xaml" />
<Page Include="Views\CalculatorProgrammerDisplayPanel.xaml"> <Page Include="Views\CalculatorProgrammerDisplayPanel.xaml">
<Filter>Views\StateTriggers</Filter> <Filter>Views\StateTriggers</Filter>
@ -535,9 +534,6 @@
<PRIResource Include="Resources\az-Latn-AZ\CEngineStrings.resw"> <PRIResource Include="Resources\az-Latn-AZ\CEngineStrings.resw">
<Filter>Resources\az-Latn-az</Filter> <Filter>Resources\az-Latn-az</Filter>
</PRIResource> </PRIResource>
<PRIResource Include="Resources\uz-Latn-UZ\CEngineStrings.resw">
<Filter>Resources\uz-latn-uz</Filter>
</PRIResource>
<PRIResource Include="Resources\af-ZA\CEngineStrings.resw"> <PRIResource Include="Resources\af-ZA\CEngineStrings.resw">
<Filter>Resources\af-za</Filter> <Filter>Resources\af-za</Filter>
</PRIResource> </PRIResource>
@ -550,9 +546,6 @@
<PRIResource Include="Resources\vi-vn\CEngineStrings.resw"> <PRIResource Include="Resources\vi-vn\CEngineStrings.resw">
<Filter>Resources\vi-vn</Filter> <Filter>Resources\vi-vn</Filter>
</PRIResource> </PRIResource>
<PRIResource Include="Resources\be-BY\CEngineStrings.resw">
<Filter>Resources\be-by</Filter>
</PRIResource>
<PRIResource Include="Resources\am-et\CEngineStrings.resw"> <PRIResource Include="Resources\am-et\CEngineStrings.resw">
<Filter>Resources\am-et</Filter> <Filter>Resources\am-et</Filter>
</PRIResource> </PRIResource>
@ -577,12 +570,6 @@
<PRIResource Include="Resources\zh-cn\CEngineStrings.resw"> <PRIResource Include="Resources\zh-cn\CEngineStrings.resw">
<Filter>Resources\zh-cn</Filter> <Filter>Resources\zh-cn</Filter>
</PRIResource> </PRIResource>
<PRIResource Include="Resources\sw-KE\CEngineStrings.resw">
<Filter>Resources\sw-ke</Filter>
</PRIResource>
<PRIResource Include="Resources\bn-BD\CEngineStrings.resw">
<Filter>Resources\bn-bd</Filter>
</PRIResource>
<PRIResource Include="Resources\ta-IN\CEngineStrings.resw"> <PRIResource Include="Resources\ta-IN\CEngineStrings.resw">
<Filter>Resources\ta-in</Filter> <Filter>Resources\ta-in</Filter>
</PRIResource> </PRIResource>
@ -673,9 +660,6 @@
<PRIResource Include="Resources\pt-br\CEngineStrings.resw"> <PRIResource Include="Resources\pt-br\CEngineStrings.resw">
<Filter>Resources\pt-br</Filter> <Filter>Resources\pt-br</Filter>
</PRIResource> </PRIResource>
<PRIResource Include="Resources\ha-Latn-NG\CEngineStrings.resw">
<Filter>Resources\ha-latn-ng</Filter>
</PRIResource>
<PRIResource Include="Resources\lt-LT\CEngineStrings.resw"> <PRIResource Include="Resources\lt-LT\CEngineStrings.resw">
<Filter>Resources\lt-lt</Filter> <Filter>Resources\lt-lt</Filter>
</PRIResource> </PRIResource>
@ -808,9 +792,6 @@
<PRIResource Include="Resources\ru-ru\Resources.resw"> <PRIResource Include="Resources\ru-ru\Resources.resw">
<Filter>Resources\ru-ru</Filter> <Filter>Resources\ru-ru</Filter>
</PRIResource> </PRIResource>
<PRIResource Include="Resources\ha-Latn-NG\Resources.resw">
<Filter>Resources\ha-latn-ng</Filter>
</PRIResource>
<PRIResource Include="Resources\lo-LA\Resources.resw"> <PRIResource Include="Resources\lo-LA\Resources.resw">
<Filter>Resources\lo-la</Filter> <Filter>Resources\lo-la</Filter>
</PRIResource> </PRIResource>
@ -853,9 +834,6 @@
<PRIResource Include="Resources\el-GR\Resources.resw"> <PRIResource Include="Resources\el-GR\Resources.resw">
<Filter>Resources\el-gr</Filter> <Filter>Resources\el-gr</Filter>
</PRIResource> </PRIResource>
<PRIResource Include="Resources\sw-KE\Resources.resw">
<Filter>Resources\sw-ke</Filter>
</PRIResource>
<PRIResource Include="Resources\uk-UA\Resources.resw"> <PRIResource Include="Resources\uk-UA\Resources.resw">
<Filter>Resources\uk-ua</Filter> <Filter>Resources\uk-ua</Filter>
</PRIResource> </PRIResource>
@ -865,9 +843,6 @@
<PRIResource Include="Resources\vi-vn\Resources.resw"> <PRIResource Include="Resources\vi-vn\Resources.resw">
<Filter>Resources\vi-vn</Filter> <Filter>Resources\vi-vn</Filter>
</PRIResource> </PRIResource>
<PRIResource Include="Resources\uz-Latn-UZ\Resources.resw">
<Filter>Resources\uz-latn-uz</Filter>
</PRIResource>
<PRIResource Include="Resources\tr-tr\Resources.resw"> <PRIResource Include="Resources\tr-tr\Resources.resw">
<Filter>Resources\tr-tr</Filter> <Filter>Resources\tr-tr</Filter>
</PRIResource> </PRIResource>
@ -877,9 +852,6 @@
<PRIResource Include="Resources\zh-tw\Resources.resw"> <PRIResource Include="Resources\zh-tw\Resources.resw">
<Filter>Resources\zh-tw</Filter> <Filter>Resources\zh-tw</Filter>
</PRIResource> </PRIResource>
<PRIResource Include="Resources\bn-BD\Resources.resw">
<Filter>Resources\bn-bd</Filter>
</PRIResource>
<PRIResource Include="Resources\cs-cz\Resources.resw"> <PRIResource Include="Resources\cs-cz\Resources.resw">
<Filter>Resources\cs-cz</Filter> <Filter>Resources\cs-cz</Filter>
</PRIResource> </PRIResource>
@ -901,9 +873,6 @@
<PRIResource Include="Resources\ar-sa\Resources.resw"> <PRIResource Include="Resources\ar-sa\Resources.resw">
<Filter>Resources\ar-sa</Filter> <Filter>Resources\ar-sa</Filter>
</PRIResource> </PRIResource>
<PRIResource Include="Resources\be-BY\Resources.resw">
<Filter>Resources\be-by</Filter>
</PRIResource>
<PRIResource Include="Resources\kk-KZ\Resources.resw"> <PRIResource Include="Resources\kk-KZ\Resources.resw">
<Filter>Resources\kk-kz</Filter> <Filter>Resources\kk-kz</Filter>
</PRIResource> </PRIResource>
@ -1583,5 +1552,7 @@
<CopyFileToFolders Include="$(GraphingEngineDll)" /> <CopyFileToFolders Include="$(GraphingEngineDll)" />
<CopyFileToFolders Include="$(GraphingImplDll)" /> <CopyFileToFolders Include="$(GraphingImplDll)" />
<CopyFileToFolders Include="$(GraphingEngineDll)" /> <CopyFileToFolders Include="$(GraphingEngineDll)" />
<CopyFileToFolders Include="$(GraphingImplDll)" />
<CopyFileToFolders Include="$(GraphingEngineDll)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

10
src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
View File

@ -266,6 +266,7 @@
<Style x:Key="EquationTextBoxStyle" TargetType="controls:EquationTextBox"> <Style x:Key="EquationTextBoxStyle" TargetType="controls:EquationTextBox">
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="{ThemeResource TextControlBorderBrush}"/>
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/> <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}"/> <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}"/>
<Setter Property="FontWeight" Value="Normal"/> <Setter Property="FontWeight" Value="Normal"/>
@ -360,7 +361,8 @@
<Setter Target="EquationButton.BorderBrush" Value="{ThemeResource EquationButtonHideLineBackgroundBrush}"/> <Setter Target="EquationButton.BorderBrush" Value="{ThemeResource EquationButtonHideLineBackgroundBrush}"/>
<Setter Target="EquationButton.Foreground" Value="{ThemeResource EquationButtonHideLineForegroundBrush}"/> <Setter Target="EquationButton.Foreground" Value="{ThemeResource EquationButtonHideLineForegroundBrush}"/>
<Setter Target="EquationButton.IsEnabled" Value="false"/> <Setter Target="EquationButton.IsEnabled" Value="false"/>
<Setter Target="EquationBoxBorder.Background" Value="{ThemeResource TextBoxBackgroundThemeBrush}"/> <Setter Target="EquationBoxBorder.Background" Value="{ThemeResource TextControlBackgroundFocused}"/>
<Setter Target="EquationBoxBorder.BorderBrush" Value="{ThemeResource EquationButtonHideLineBackgroundBrush}"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="Error"> <VisualState x:Name="Error">
@ -403,7 +405,7 @@
<VisualState x:Name="Focused"> <VisualState x:Name="Focused">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="EquationBoxBorder.BorderBrush" Value="{ThemeResource EquationTextBoxBorderBrushFocused}"/> <Setter Target="EquationBoxBorder.BorderBrush" Value="{ThemeResource EquationTextBoxBorderBrushFocused}"/>
<Setter Target="EquationBoxBorder.Background" Value="{ThemeResource TextBoxBackgroundThemeBrush}"/> <Setter Target="EquationBoxBorder.Background" Value="{ThemeResource TextControlBackgroundFocused}"/>
<Setter Target="MathRichEditBox.Foreground" Value="{ThemeResource TextControlForegroundFocused}"/> <Setter Target="MathRichEditBox.Foreground" Value="{ThemeResource TextControlForegroundFocused}"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
@ -411,7 +413,7 @@
<VisualState.Setters> <VisualState.Setters>
<Setter Target="EquationBoxBorder.BorderBrush" Value="{ThemeResource EquationBoxErrorBorderBrush}"/> <Setter Target="EquationBoxBorder.BorderBrush" Value="{ThemeResource EquationBoxErrorBorderBrush}"/>
<Setter Target="EquationBoxBorder.BorderThickness" Value="1"/> <Setter Target="EquationBoxBorder.BorderThickness" Value="1"/>
<Setter Target="EquationBoxBorder.Background" Value="{ThemeResource TextBoxBackgroundThemeBrush}"/> <Setter Target="EquationBoxBorder.Background" Value="{ThemeResource TextControlBackgroundFocused}"/>
<Setter Target="ErrorIcon.Visibility" Value="Collapsed"/> <Setter Target="ErrorIcon.Visibility" Value="Collapsed"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
@ -816,7 +818,7 @@
<SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=EquationColor.Color}"/> <SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=EquationColor.Color}"/>
<SolidColorBrush x:Key="ButtonRevealBackgroundPointerOver" Color="Transparent"/> <SolidColorBrush x:Key="ButtonRevealBackgroundPointerOver" Color="Transparent"/>
<SolidColorBrush x:Key="ButtonRevealBackgroundPressed" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=EquationColor.Color}"/> <SolidColorBrush x:Key="ButtonRevealBackgroundPressed" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=EquationColor.Color}"/>
<SolidColorBrush x:Key="ButtonRevealBackground" Color="Transparent"/> <SolidColorBrush x:Key="ButtonRevealBackground" Color="{ThemeResource TextControlBackgroundFocused}"/>
<RevealBorderBrush x:Key="ButtonRevealBorderBrush" <RevealBorderBrush x:Key="ButtonRevealBorderBrush"
Opacity="0.33" Opacity="0.33"
FallbackColor="Transparent" FallbackColor="Transparent"

37
src/Calculator/Views/MainPage.xaml
View File

@ -173,36 +173,23 @@
x:Load="False"> x:Load="False">
<muxc:NavigationView.PaneFooter> <muxc:NavigationView.PaneFooter>
<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical"> <muxc:NavigationViewItem x:Name="AboutButton"
<muxc:NavigationViewList x:Name="NavFooter"
Width="{StaticResource SplitViewOpenPaneLength}"
IsItemClickEnabled="True"
ItemClick="OnAboutButtonClick"
x:Load="False">
<muxc:NavigationViewList.ItemContainerTransitions>
<!-- Remove EntranceThemeTransition which is a default transition for NavigationViewList -->
<TransitionCollection/>
</muxc:NavigationViewList.ItemContainerTransitions>
<muxc:NavigationViewList.Items>
<muxc:NavigationViewItem x:Name="AboutButton"
x:Uid="AboutButton" x:Uid="AboutButton"
Style="{StaticResource NavViewItemStyle}"> Style="{StaticResource NavViewItemStyle}"
<muxc:NavigationViewItem.Icon> Tapped="OnAboutButtonClick">
<FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xe946;"/> <muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem.Icon> <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xe946;"/>
<FlyoutBase.AttachedFlyout> </muxc:NavigationViewItem.Icon>
<Flyout x:Name="AboutPageFlyout" <FlyoutBase.AttachedFlyout>
<Flyout x:Name="AboutPageFlyout"
x:Uid="AboutPageFlyout" x:Uid="AboutPageFlyout"
Closed="OnAboutFlyoutClosed" Closed="OnAboutFlyoutClosed"
FlyoutPresenterStyle="{StaticResource AboutFlyoutPresenterStyle}" FlyoutPresenterStyle="{StaticResource AboutFlyoutPresenterStyle}"
Opened="OnAboutFlyoutOpened"> Opened="OnAboutFlyoutOpened">
<local:AboutFlyout x:Name="AboutPage" x:Load="False"/> <local:AboutFlyout x:Name="AboutPage" x:Load="False"/>
</Flyout> </Flyout>
</FlyoutBase.AttachedFlyout> </FlyoutBase.AttachedFlyout>
</muxc:NavigationViewItem> </muxc:NavigationViewItem>
</muxc:NavigationViewList.Items>
</muxc:NavigationViewList>
</StackPanel>
</muxc:NavigationView.PaneFooter> </muxc:NavigationView.PaneFooter>
</muxc:NavigationView> </muxc:NavigationView>
</Grid> </Grid>

4
src/Calculator/Views/MainPage.xaml.cpp
View File

@ -405,9 +405,9 @@ void MainPage::OnNavLoaded(_In_ Object ^ sender, _In_ RoutedEventArgs ^ e)
void MainPage::OnNavPaneOpening(_In_ MUXC::NavigationView ^ sender, _In_ Object ^ args) void MainPage::OnNavPaneOpening(_In_ MUXC::NavigationView ^ sender, _In_ Object ^ args)
{ {
if (!NavFooter) if (!AboutButton)
{ {
this->FindName(L"NavFooter"); this->FindName(L"AboutButton");
} }
} }

6
src/Calculator/packages.config
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Microsoft.UI.Xaml" version="2.3.200213001" targetFramework="native" /> <package id="Microsoft.UI.Xaml" version="2.4.3" targetFramework="native" />
<package id="Microsoft.WindowsCalculator.PGO" version="1.0.2" targetFramework="native" /> <package id="Microsoft.WindowsCalculator.PGO" version="1.0.2" targetFramework="native" />
</packages> </packages>