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

Tweak UI: Title and History/Memory panels (#1215)

Browse Source
This commit is contained in:
Rudy Huyn 2020-05-11 16:38:45 -07:00 committed by GitHub
parent 1eda521992
commit 7a6b0a72c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1124,6 +1124,7 @@
</Border.Resources> </Border.Resources>
<Pivot x:Name="DockPivot" <Pivot x:Name="DockPivot"
Margin="0,-3,0,0"
TabIndex="5" TabIndex="5"
Tapped="DockPanelTapped" Tapped="DockPanelTapped"
Template="{StaticResource DockPanelTemplate}"> Template="{StaticResource DockPanelTemplate}">

2
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
View File

@ -553,7 +553,7 @@
<Grid x:Name="LeftGrid" <Grid x:Name="LeftGrid"
Grid.Row="1" Grid.Row="1"
Padding="0,4,0,0" Padding="0,4,0,0"
Visibility="{x:Bind ShouldDisplayPanel(IsSmallState, SwitchModeToggleButton.IsOn, x:True), Mode=OneWay}"> Visibility="{x:Bind local:GraphingCalculator.ShouldDisplayPanel(IsSmallState, SwitchModeToggleButton.IsOn, x:True), Mode=OneWay}">
<Grid.Resources> <Grid.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>

3
src/Calculator/Views/HistoryList.xaml
View File

@ -132,9 +132,10 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock x:Name="HistoryEmpty" <TextBlock x:Name="HistoryEmpty"
x:Uid="HistoryEmpty" x:Uid="HistoryEmpty"
Margin="12,14,24,0" Margin="16,14,24,0"
Style="{ThemeResource BaseTextBlockStyle}" Style="{ThemeResource BaseTextBlockStyle}"
Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}" Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
FontWeight="SemiLight"
TextWrapping="Wrap" TextWrapping="Wrap"
Visibility="{Binding ItemSize, Converter={StaticResource ItemSizeToVisibilityConverter}}"/> Visibility="{Binding ItemSize, Converter={StaticResource ItemSizeToVisibilityConverter}}"/>
<ListView x:Name="HistoryListView" <ListView x:Name="HistoryListView"

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

@ -33,6 +33,12 @@
<Setter Property="KeyTipPlacementMode" Value="Right"/> <Setter Property="KeyTipPlacementMode" Value="Right"/>
</Style> </Style>
<Style x:Key="CategoryNameTextBlockStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="20"/>
<Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="OpticalMarginAlignment" Value="TrimSideBearings"/>
</Style>
<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}"/>
@ -169,12 +175,12 @@
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Margin="52,0,0,0" Orientation="Horizontal"> <StackPanel Margin="48,0,0,0" Orientation="Horizontal">
<TextBlock x:Name="Header" <TextBlock x:Name="Header"
Margin="0,-3,0,0" Margin="0,-3,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource SubtitleTextBlockStyle}" Style="{StaticResource CategoryNameTextBlockStyle}"
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="10,0,0,0" <controls:PreviewTagControl Margin="10,0,0,0"

3
src/Calculator/Views/Memory.xaml
View File

@ -96,9 +96,10 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock x:Name="MemoryPaneEmpty" <TextBlock x:Name="MemoryPaneEmpty"
x:Uid="MemoryPaneEmpty" x:Uid="MemoryPaneEmpty"
Margin="12,14,24,0" Margin="16,14,24,0"
Style="{ThemeResource BaseTextBlockStyle}" Style="{ThemeResource BaseTextBlockStyle}"
Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}" Foreground="{ThemeResource SystemControlPageTextBaseHighBrush}"
FontWeight="SemiLight"
TextWrapping="Wrap" TextWrapping="Wrap"
Visibility="{Binding IsMemoryEmpty, Converter={StaticResource BooleanToVisibilityConverter}}"/> Visibility="{Binding IsMemoryEmpty, Converter={StaticResource BooleanToVisibilityConverter}}"/>
<ListView x:Name="MemoryListView" <ListView x:Name="MemoryListView"