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

Calculator.xaml - Simple Readability Adjustments

Browse source 
Improved readability of the XAML document by inserting newline where they were missing and removed rextra newlines from others.
This commit is contained in:
Lance McCarthy 2019-03-01 08:13:30 -05:00
commit e25bc6783c
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/Calculator/Views/Calculator.xaml
View file

@ -14,6 +14,7 @@
<UserControl.Resources> <UserControl.Resources>
<automation:NarratorNotifier x:Name="NarratorNotifier" Announcement="{x:Bind Model.Announcement, Mode=OneWay}"/> <automation:NarratorNotifier x:Name="NarratorNotifier" Announcement="{x:Bind Model.Announcement, Mode=OneWay}"/>
<Style x:Key="OperandTextBoxStyle" TargetType="controls:OperandTextBox"> <Style x:Key="OperandTextBoxStyle" TargetType="controls:OperandTextBox">
<Setter Property="MinWidth" Value="32"/> <Setter Property="MinWidth" Value="32"/>
<Setter Property="MinHeight" Value="20"/> <Setter Property="MinHeight" Value="20"/>
@ -122,12 +123,14 @@
IsTextScaleFactorEnabled="False" IsTextScaleFactorEnabled="False"
Text="{Binding Token, Mode=OneWay}"/> Text="{Binding Token, Mode=OneWay}"/>
</DataTemplate> </DataTemplate>
<DataTemplate x:Key="Operator" x:DataType="common:DisplayExpressionToken"> <DataTemplate x:Key="Operator" x:DataType="common:DisplayExpressionToken">
<TextBlock Margin="2,0,0,0" <TextBlock Margin="2,0,0,0"
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}" Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
IsTextScaleFactorEnabled="False" IsTextScaleFactorEnabled="False"
Text="{Binding Token, Mode=OneWay}"/> Text="{Binding Token, Mode=OneWay}"/>
</DataTemplate> </DataTemplate>
<DataTemplate x:Key="Separator" x:DataType="common:DisplayExpressionToken"> <DataTemplate x:Key="Separator" x:DataType="common:DisplayExpressionToken">
<TextBlock x:Name="MainText" <TextBlock x:Name="MainText"
IsTextScaleFactorEnabled="False" IsTextScaleFactorEnabled="False"
@ -172,6 +175,7 @@
<Setter Property="IsTabStop" Value="False"/> <Setter Property="IsTabStop" Value="False"/>
<Setter Property="MinWidth" Value="4"/> <Setter Property="MinWidth" Value="4"/>
</Style> </Style>
<Style x:Key="EditableOperatorContainerStyle" <Style x:Key="EditableOperatorContainerStyle"
BasedOn="{StaticResource ExpressionBaseContainerStyle}" BasedOn="{StaticResource ExpressionBaseContainerStyle}"
TargetType="ListViewItem"> TargetType="ListViewItem">
@ -183,6 +187,7 @@
OperandTemplate="{StaticResource Operand}" OperandTemplate="{StaticResource Operand}"
OperatorTemplate="{StaticResource Operator}" OperatorTemplate="{StaticResource Operator}"
SeparatorTemplate="{StaticResource Separator}"/> SeparatorTemplate="{StaticResource Separator}"/>
<converters:ExpressionItemContainerStyle x:Key="ExpressionItemContainerStyle" <converters:ExpressionItemContainerStyle x:Key="ExpressionItemContainerStyle"
EditableOperatorStyle="{StaticResource NonEditableOperatorContainerStyle}" EditableOperatorStyle="{StaticResource NonEditableOperatorContainerStyle}"
NonEditableOperatorStyle="{StaticResource NonEditableOperatorContainerStyle}" NonEditableOperatorStyle="{StaticResource NonEditableOperatorContainerStyle}"
@ -399,6 +404,7 @@
</EasingDoubleKeyFrame> </EasingDoubleKeyFrame>
</DoubleAnimationUsingKeyFrames> </DoubleAnimationUsingKeyFrames>
</Storyboard> </Storyboard>
<Storyboard x:Name="AnimateWithoutResult"> <Storyboard x:Name="AnimateWithoutResult">
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="NumpadPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleX)"> <DoubleAnimationUsingKeyFrames Storyboard.TargetName="NumpadPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleX)">
<EasingDoubleKeyFrame KeyTime="0" Value="0.92"> <EasingDoubleKeyFrame KeyTime="0" Value="0.92">
@ -579,6 +585,7 @@
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<Grid FlowDirection="LeftToRight"> <Grid FlowDirection="LeftToRight">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition x:Name="RowHamburger" Height="{StaticResource HamburgerHeightGridLength}"/> <RowDefinition x:Name="RowHamburger" Height="{StaticResource HamburgerHeightGridLength}"/>
@ -683,6 +690,7 @@
Width="1*" Width="1*"
MaxWidth="80"/> MaxWidth="80"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<controls:CalculatorButton x:Name="ClearMemoryButton" <controls:CalculatorButton x:Name="ClearMemoryButton"
x:Uid="ClearMemoryButton" x:Uid="ClearMemoryButton"
Style="{StaticResource CaptionButtonStyle}" Style="{StaticResource CaptionButtonStyle}"
@ -763,9 +771,8 @@
<local:OperatorsPanel x:Name="OpsPanel" IsBitFlipChecked="{x:Bind Model.IsBitFlipChecked, Mode=OneWay}"/> <local:OperatorsPanel x:Name="OpsPanel" IsBitFlipChecked="{x:Bind Model.IsBitFlipChecked, Mode=OneWay}"/>
</Grid> </Grid>
</Grid> </Grid>
<!-- Docked Pivot panel for history/memory --> <!-- Docked Pivot panel for history/memory -->
<Border x:Name="DockPanel" <Border x:Name="DockPanel"
x:Uid="DockPanel" x:Uid="DockPanel"
@ -810,6 +817,7 @@
<Setter Property="FontSize" Value="{ThemeResource PivotTitleFontSize}"/> <Setter Property="FontSize" Value="{ThemeResource PivotTitleFontSize}"/>
</Style> </Style>
</Grid.Resources> </Grid.Resources>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
@ -818,7 +826,6 @@
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="Orientation"> <VisualStateGroup x:Name="Orientation">
<VisualState x:Name="Portrait"> <VisualState x:Name="Portrait">
<Storyboard> <Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitleContentControl" Storyboard.TargetProperty="Margin"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitleContentControl" Storyboard.TargetProperty="Margin">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPortraitThemePadding}"/> <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPortraitThemePadding}"/>
@ -826,7 +833,6 @@
</Storyboard> </Storyboard>
</VisualState> </VisualState>
<VisualState x:Name="Landscape"> <VisualState x:Name="Landscape">
<Storyboard> <Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitleContentControl" Storyboard.TargetProperty="Margin"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitleContentControl" Storyboard.TargetProperty="Margin">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotLandscapeThemePadding}"/> <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotLandscapeThemePadding}"/>
@ -837,7 +843,6 @@
<VisualStateGroup x:Name="NavigationButtonsVisibility"> <VisualStateGroup x:Name="NavigationButtonsVisibility">
<VisualState x:Name="NavigationButtonsHidden"/> <VisualState x:Name="NavigationButtonsHidden"/>
<VisualState x:Name="NavigationButtonsVisible"> <VisualState x:Name="NavigationButtonsVisible">
<Storyboard> <Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton" Storyboard.TargetProperty="Opacity"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton" Storyboard.TargetProperty="Opacity">
<DiscreteObjectKeyFrame KeyTime="0" Value="1"/> <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
@ -854,7 +859,6 @@
</Storyboard> </Storyboard>
</VisualState> </VisualState>
<VisualState x:Name="PreviousButtonVisible"> <VisualState x:Name="PreviousButtonVisible">
<Storyboard> <Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton" Storyboard.TargetProperty="Opacity"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton" Storyboard.TargetProperty="Opacity">
<DiscreteObjectKeyFrame KeyTime="0" Value="1"/> <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
@ -865,7 +869,6 @@
</Storyboard> </Storyboard>
</VisualState> </VisualState>
<VisualState x:Name="NextButtonVisible"> <VisualState x:Name="NextButtonVisible">
<Storyboard> <Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton" Storyboard.TargetProperty="Opacity"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton" Storyboard.TargetProperty="Opacity">
<DiscreteObjectKeyFrame KeyTime="0" Value="1"/> <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
@ -879,7 +882,6 @@
<VisualStateGroup x:Name="HeaderStates"> <VisualStateGroup x:Name="HeaderStates">
<VisualState x:Name="HeaderDynamic"/> <VisualState x:Name="HeaderDynamic"/>
<VisualState x:Name="HeaderStatic"> <VisualState x:Name="HeaderStatic">
<Storyboard> <Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Header" Storyboard.TargetProperty="Visibility"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Header" Storyboard.TargetProperty="Visibility">
<DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/> <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
@ -892,6 +894,7 @@
</VisualStateGroup> </VisualStateGroup>
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<ContentControl x:Name="TitleContentControl" <ContentControl x:Name="TitleContentControl"
Margin="{StaticResource PivotPortraitThemePadding}" Margin="{StaticResource PivotPortraitThemePadding}"
Style="{StaticResource TitleContentControlStyle}" Style="{StaticResource TitleContentControlStyle}"
@ -899,6 +902,7 @@
ContentTemplate="{TemplateBinding TitleTemplate}" ContentTemplate="{TemplateBinding TitleTemplate}"
IsTabStop="False" IsTabStop="False"
Visibility="Collapsed"/> Visibility="Collapsed"/>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.Resources> <Grid.Resources>
<ControlTemplate x:Key="NextTemplate" TargetType="Button"> <ControlTemplate x:Key="NextTemplate" TargetType="Button">
@ -948,6 +952,7 @@
UseLayoutRounding="False"/> UseLayoutRounding="False"/>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
<ControlTemplate x:Key="PreviousTemplate" TargetType="Button"> <ControlTemplate x:Key="PreviousTemplate" TargetType="Button">
<Border x:Name="Root" <Border x:Name="Root"
Background="{ThemeResource PivotPreviousButtonBackground}" Background="{ThemeResource PivotPreviousButtonBackground}"
@ -996,6 +1001,7 @@
</Border> </Border>
</ControlTemplate> </ControlTemplate>
</Grid.Resources> </Grid.Resources>
<ScrollViewer x:Name="ScrollViewer" <ScrollViewer x:Name="ScrollViewer"
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
VerticalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
@ -1104,10 +1110,10 @@
</PivotPanel> </PivotPanel>
</ScrollViewer> </ScrollViewer>
</Grid> </Grid>
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</Border.Resources> </Border.Resources>
<Pivot x:Name="DockPivot" <Pivot x:Name="DockPivot"
SelectionChanged="DockPivot_SelectionChanged" SelectionChanged="DockPivot_SelectionChanged"
TabIndex="5" TabIndex="5"
@ -1261,4 +1267,3 @@
</Border> </Border>
</Grid> </Grid>
</UserControl> </UserControl>