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

Fix title bar string trimming issue and right-to-left display issue (#1635)

Browse Source
This commit is contained in:
hanzhang54 2021-08-09 13:21:05 +08:00 committed by GitHub
parent 5179320c44
commit 61985c1b8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Calculator/Views/TitleBar.xaml
View File

@ -65,14 +65,13 @@
Background="Transparent"> Background="Transparent">
<Grid x:Name="TitleHolder"> <Grid x:Name="TitleHolder">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Image x:Name="AppIcon" <Image x:Name="AppIcon"
Width="16" Width="20"
Height="16" Height="20"
Margin="16,0,0,0" Margin="16,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
@ -80,7 +79,7 @@
<TextBlock x:Name="AppName" <TextBlock x:Name="AppName"
x:Uid="AppName" x:Uid="AppName"
Grid.Column="1" Grid.Column="1"
Margin="16,0,16,0" Margin="12,0,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="12" FontSize="12"

2
src/Calculator/Views/TitleBar.xaml.cs
View File

@ -154,7 +154,7 @@ private void SetTitleBarHeightAndPadding()
else else
{ {
leftAddition = m_coreTitleBar.SystemOverlayRightInset; leftAddition = m_coreTitleBar.SystemOverlayRightInset;
leftAddition = m_coreTitleBar.SystemOverlayLeftInset; rightAddition = m_coreTitleBar.SystemOverlayLeftInset;
} }
LayoutRoot.Padding = new Thickness(leftAddition, 0, rightAddition, 0); LayoutRoot.Padding = new Thickness(leftAddition, 0, rightAddition, 0);