Update WinUI Version to 2.4 (#1354)
* 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:
@@ -266,6 +266,7 @@
|
||||
|
||||
<Style x:Key="EquationTextBoxStyle" TargetType="controls:EquationTextBox">
|
||||
<Setter Property="Background" Value="Transparent"/>
|
||||
<Setter Property="BorderBrush" Value="{ThemeResource TextControlBorderBrush}"/>
|
||||
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
|
||||
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}"/>
|
||||
<Setter Property="FontWeight" Value="Normal"/>
|
||||
@@ -360,7 +361,8 @@
|
||||
<Setter Target="EquationButton.BorderBrush" Value="{ThemeResource EquationButtonHideLineBackgroundBrush}"/>
|
||||
<Setter Target="EquationButton.Foreground" Value="{ThemeResource EquationButtonHideLineForegroundBrush}"/>
|
||||
<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>
|
||||
<VisualState x:Name="Error">
|
||||
@@ -403,7 +405,7 @@
|
||||
<VisualState x:Name="Focused">
|
||||
<VisualState.Setters>
|
||||
<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}"/>
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
@@ -411,7 +413,7 @@
|
||||
<VisualState.Setters>
|
||||
<Setter Target="EquationBoxBorder.BorderBrush" Value="{ThemeResource EquationBoxErrorBorderBrush}"/>
|
||||
<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"/>
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
@@ -816,7 +818,7 @@
|
||||
<SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=EquationColor.Color}"/>
|
||||
<SolidColorBrush x:Key="ButtonRevealBackgroundPointerOver" Color="Transparent"/>
|
||||
<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"
|
||||
Opacity="0.33"
|
||||
FallbackColor="Transparent"
|
||||
|
@@ -173,36 +173,23 @@
|
||||
x:Load="False">
|
||||
|
||||
<muxc:NavigationView.PaneFooter>
|
||||
<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
|
||||
<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"
|
||||
<muxc:NavigationViewItem x:Name="AboutButton"
|
||||
x:Uid="AboutButton"
|
||||
Style="{StaticResource NavViewItemStyle}">
|
||||
<muxc:NavigationViewItem.Icon>
|
||||
<FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph=""/>
|
||||
</muxc:NavigationViewItem.Icon>
|
||||
<FlyoutBase.AttachedFlyout>
|
||||
<Flyout x:Name="AboutPageFlyout"
|
||||
Style="{StaticResource NavViewItemStyle}"
|
||||
Tapped="OnAboutButtonClick">
|
||||
<muxc:NavigationViewItem.Icon>
|
||||
<FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph=""/>
|
||||
</muxc:NavigationViewItem.Icon>
|
||||
<FlyoutBase.AttachedFlyout>
|
||||
<Flyout x:Name="AboutPageFlyout"
|
||||
x:Uid="AboutPageFlyout"
|
||||
Closed="OnAboutFlyoutClosed"
|
||||
FlyoutPresenterStyle="{StaticResource AboutFlyoutPresenterStyle}"
|
||||
Opened="OnAboutFlyoutOpened">
|
||||
<local:AboutFlyout x:Name="AboutPage" x:Load="False"/>
|
||||
</Flyout>
|
||||
</FlyoutBase.AttachedFlyout>
|
||||
</muxc:NavigationViewItem>
|
||||
</muxc:NavigationViewList.Items>
|
||||
</muxc:NavigationViewList>
|
||||
</StackPanel>
|
||||
<local:AboutFlyout x:Name="AboutPage" x:Load="False"/>
|
||||
</Flyout>
|
||||
</FlyoutBase.AttachedFlyout>
|
||||
</muxc:NavigationViewItem>
|
||||
</muxc:NavigationView.PaneFooter>
|
||||
</muxc:NavigationView>
|
||||
</Grid>
|
||||
|
@@ -405,9 +405,9 @@ void MainPage::OnNavLoaded(_In_ Object ^ sender, _In_ RoutedEventArgs ^ e)
|
||||
|
||||
void MainPage::OnNavPaneOpening(_In_ MUXC::NavigationView ^ sender, _In_ Object ^ args)
|
||||
{
|
||||
if (!NavFooter)
|
||||
if (!AboutButton)
|
||||
{
|
||||
this->FindName(L"NavFooter");
|
||||
this->FindName(L"AboutButton");
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user