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

Change Calculator app name back to Calculator and add more margin to the preview tag for graphing mode (#909)

Browse Source
This commit is contained in:
Stephanie Anderl 2020-01-08 14:56:44 -08:00 committed by GitHub
parent 8141941208
commit c3414ea9c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Calculator/Resources/en-US/Resources.resw
View File

@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="AppName" xml:space="preserve"> <data name="AppName" xml:space="preserve">
<value>Graphing Calculator</value> <value>Calculator</value>
<comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment> <comment>{@Appx_ShortDisplayName@}{StringCategory="Feature Title"} This is the title of the official application when published through Windows Store.</comment>
</data> </data>
<data name="DevAppName" xml:space="preserve"> <data name="DevAppName" xml:space="preserve">
@ -4258,4 +4258,4 @@
<value>Enter an equation</value> <value>Enter an equation</value>
<comment>this is the placeholder text used by the textbox to enter an equation</comment> <comment>this is the placeholder text used by the textbox to enter an equation</comment>
</data> </data>
</root> </root>

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

@ -36,7 +36,7 @@
<DataTemplate x:Key="NavMenuItemPreviewDataTemplate" x:DataType="x:String"> <DataTemplate x:Key="NavMenuItemPreviewDataTemplate" x:DataType="x:String">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="{x:Bind}"/> <TextBlock VerticalAlignment="Center" Text="{x:Bind}"/>
<controls:PreviewTagControl Margin="6,0,0,0" VerticalAlignment="Center"/> <controls:PreviewTagControl Margin="10,0,0,0" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
@ -177,7 +177,7 @@
Style="{StaticResource SubtitleTextBlockStyle}" Style="{StaticResource SubtitleTextBlockStyle}"
Text="{x:Bind Model.CategoryName, Mode=OneWay}" Text="{x:Bind Model.CategoryName, Mode=OneWay}"
Visibility="{x:Bind Model.IsAlwaysOnTop, Converter={StaticResource BooleanToVisibilityNegationConverter}, Mode=OneWay}"/> Visibility="{x:Bind Model.IsAlwaysOnTop, Converter={StaticResource BooleanToVisibilityNegationConverter}, Mode=OneWay}"/>
<controls:PreviewTagControl Margin="6,0,0,0" <controls:PreviewTagControl Margin="10,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Visibility="{x:Bind Model.IsModePreview, Mode=OneWay}"/> Visibility="{x:Bind Model.IsModePreview, Mode=OneWay}"/>
</StackPanel> </StackPanel>