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

Remove unused expression item template selector (#623)

Browse Source 
* remove unused AlwaysOnTopExpressionItemTemplateSelector

* replace incorrect ThemeResource by StaticResource references
This commit is contained in:
Rudy Huyn 2019-08-20 12:55:49 -07:00 committed by Stephanie Anderl
parent 5966503703
commit 71b010483b
1 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,26 +34,6 @@
Text="{x:Bind Token, Mode=OneWay}"/> Text="{x:Bind Token, Mode=OneWay}"/>
</DataTemplate> </DataTemplate>
<DataTemplate x:Key="AlwaysOnTopOperand" x:DataType="common:DisplayExpressionToken">
<TextBlock Margin="2,0,0,0"
Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
IsTextScaleFactorEnabled="False"
Text="{x:Bind Token, Mode=OneWay}"/>
</DataTemplate>
<DataTemplate x:Key="AlwaysOnTopOperator" x:DataType="common:DisplayExpressionToken">
<TextBlock Margin="2,0,0,0"
Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
IsTextScaleFactorEnabled="False"
Text="{x:Bind Token, Mode=OneWay}"/>
</DataTemplate>
<DataTemplate x:Key="AlwaysOnTopSeparator" x:DataType="common:DisplayExpressionToken">
<TextBlock x:Name="MainText"
IsTextScaleFactorEnabled="False"
Text="{x:Bind Token, Mode=OneWay}"/>
</DataTemplate>
<!-- TextBox Styles --> <!-- TextBox Styles -->
<Style x:Key="NormalStyle" TargetType="controls:OverflowTextBlock"> <Style x:Key="NormalStyle" TargetType="controls:OverflowTextBlock">
@ -377,11 +357,6 @@
OperatorTemplate="{StaticResource Operator}" OperatorTemplate="{StaticResource Operator}"
SeparatorTemplate="{StaticResource Separator}"/> SeparatorTemplate="{StaticResource Separator}"/>
<converters:ExpressionItemTemplateSelector x:Key="AlwaysOnTopExpressionItemTemplateSelector"
OperandTemplate="{StaticResource AlwaysOnTopOperand}"
OperatorTemplate="{StaticResource AlwaysOnTopOperator}"
SeparatorTemplate="{StaticResource AlwaysOnTopSeparator}"/>
<!-- Miscellaneous Resources --> <!-- Miscellaneous 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}"/>
@ -544,7 +519,7 @@
<Setter Target="RowResult.MinHeight" Value="54"/> <Setter Target="RowResult.MinHeight" Value="54"/>
<Setter Target="RowResult.Height" Value="72*"/> <Setter Target="RowResult.Height" Value="72*"/>
<Setter Target="AlwaysOnTopResults.FontSize" Value="40"/> <Setter Target="AlwaysOnTopResults.FontSize" Value="40"/>
<Setter Target="AlwaysOnTopResults.Style" Value="{ThemeResource AlwaysOnTopStyleM}"/> <Setter Target="AlwaysOnTopResults.Style" Value="{StaticResource AlwaysOnTopStyleM}"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="MinAlwaysOnTop"> <VisualState x:Name="MinAlwaysOnTop">
@ -555,7 +530,7 @@
<Setter Target="RowResult.MinHeight" Value="20"/> <Setter Target="RowResult.MinHeight" Value="20"/>
<Setter Target="RowResult.Height" Value="72*"/> <Setter Target="RowResult.Height" Value="72*"/>
<Setter Target="AlwaysOnTopResults.FontSize" Value="18"/> <Setter Target="AlwaysOnTopResults.FontSize" Value="18"/>
<Setter Target="AlwaysOnTopResults.Style" Value="{ThemeResource AlwaysOnTopStyleS}"/> <Setter Target="AlwaysOnTopResults.Style" Value="{StaticResource AlwaysOnTopStyleS}"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -617,7 +592,7 @@
<controls:OverflowTextBlock x:Name="ExpressionText" <controls:OverflowTextBlock x:Name="ExpressionText"
Grid.Row="1" Grid.Row="1"
Margin="6,0,6,0" Margin="6,0,6,0"
Style="{ThemeResource NormalStyle}" Style="{StaticResource NormalStyle}"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
AutomationProperties.AutomationId="CalculatorExpression" AutomationProperties.AutomationId="CalculatorExpression"
AutomationProperties.Name="{x:Bind Model.CalculationExpressionAutomationName, Mode=OneWay}" AutomationProperties.Name="{x:Bind Model.CalculationExpressionAutomationName, Mode=OneWay}"
@ -628,7 +603,7 @@
x:Uid="CalculatorResults" x:Uid="CalculatorResults"
Grid.Row="2" Grid.Row="2"
Margin="0,0,0,0" Margin="0,0,0,0"
Style="{ThemeResource ResultsStyle}" Style="{StaticResource ResultsStyle}"
AutomationProperties.AutomationId="CalculatorResults" AutomationProperties.AutomationId="CalculatorResults"
AutomationProperties.HeadingLevel="Level1" AutomationProperties.HeadingLevel="Level1"
AutomationProperties.Name="{x:Bind Model.CalculationResultAutomationName, Mode=OneWay}" AutomationProperties.Name="{x:Bind Model.CalculationResultAutomationName, Mode=OneWay}"
@ -685,7 +660,7 @@
<Flyout x:Name="HistoryFlyout" <Flyout x:Name="HistoryFlyout"
AutomationProperties.AutomationId="HistoryFlyout" AutomationProperties.AutomationId="HistoryFlyout"
Closed="HistoryFlyout_Closed" Closed="HistoryFlyout_Closed"
FlyoutPresenterStyle="{ThemeResource HistoryFlyoutStyle}" FlyoutPresenterStyle="{StaticResource HistoryFlyoutStyle}"
Opened="HistoryFlyout_Opened" Opened="HistoryFlyout_Opened"
Placement="Full"/> Placement="Full"/>
</FlyoutBase.AttachedFlyout> </FlyoutBase.AttachedFlyout>
@ -784,7 +759,7 @@
x:Uid="MemoryFlyout" x:Uid="MemoryFlyout"
AutomationProperties.AutomationId="MemoryFlyout" AutomationProperties.AutomationId="MemoryFlyout"
Closed="OnMemoryFlyoutClosed" Closed="OnMemoryFlyoutClosed"
FlyoutPresenterStyle="{ThemeResource MemoryFlyoutStyle}" FlyoutPresenterStyle="{StaticResource MemoryFlyoutStyle}"
Opened="OnMemoryFlyoutOpened" Opened="OnMemoryFlyoutOpened"
Placement="Full"/> Placement="Full"/>
</FlyoutBase.AttachedFlyout> </FlyoutBase.AttachedFlyout>