CommunityToolkit
/
WindowsCommunityToolkit
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #4249 from XAML-Knight/dev/InAppNotifDismiss225 

Upgraded Dismiss button to be legible at 225% text display setting
This commit is contained in:
Michael Hawker MSFT (XAML Llama) 2021-09-16 15:05:06 -07:00 коммит произвёл GitHub
Родитель e146ab5584 f0e1617dd3
Коммит 6ed77211e0
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 5 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind
Просмотреть файл

@ -110,6 +110,7 @@
<Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" /> <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
<Setter Property="Width" Value="40" /> <Setter Property="Width" Value="40" />
<Setter Property="Height" Value="40" /> <Setter Property="Height" Value="40" />
<Setter Property="Padding" Value="4" />
<Setter Property="UseSystemFocusVisuals" Value="True" /> <Setter Property="UseSystemFocusVisuals" Value="True" />
<Setter Property="HighContrastAdjustment" Value="None" /> <Setter Property="HighContrastAdjustment" Value="None" />
<Setter Property="Template"> <Setter Property="Template">
@ -264,7 +265,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Visibility="{Binding ShowDismissButton, ElementName=ExampleCustomInAppNotification}"> Visibility="{Binding ShowDismissButton, ElementName=ExampleCustomInAppNotification}">
<Button.RenderTransform> <Button.RenderTransform>
<TranslateTransform x:Name="DismissButtonTransform" X="25" Y="-5"/> <TranslateTransform x:Name="DismissButtonTransform" X="20" Y="1"/>
</Button.RenderTransform> </Button.RenderTransform>
</Button> </Button>
</Grid> </Grid>

4
Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml
Просмотреть файл

@ -43,6 +43,7 @@
<Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" /> <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
<Setter Property="Width" Value="{StaticResource SystemControlMSEdgeNotificationDismissButtonSize}" /> <Setter Property="Width" Value="{StaticResource SystemControlMSEdgeNotificationDismissButtonSize}" />
<Setter Property="Height" Value="{StaticResource SystemControlMSEdgeNotificationDismissButtonSize}" /> <Setter Property="Height" Value="{StaticResource SystemControlMSEdgeNotificationDismissButtonSize}" />
<Setter Property="Padding" Value="4" />
<Setter Property="UseSystemFocusVisuals" Value="True" /> <Setter Property="UseSystemFocusVisuals" Value="True" />
<Setter Property="HighContrastAdjustment" Value="None" /> <Setter Property="HighContrastAdjustment" Value="None" />
<Setter Property="Template"> <Setter Property="Template">
@ -150,9 +151,10 @@
FontFamily="Segoe MDL2 Assets" FontFamily="Segoe MDL2 Assets"
FontSize="12" FontSize="12"
VerticalAlignment="Top" VerticalAlignment="Top"
Padding="4"
Style="{StaticResource DismissTextBlockButtonStyle}"> Style="{StaticResource DismissTextBlockButtonStyle}">
<Button.RenderTransform> <Button.RenderTransform>
<TranslateTransform x:Name="DismissButtonTransform" X="25" Y="-5"/> <TranslateTransform x:Name="DismissButtonTransform" X="20" Y="1"/>
</Button.RenderTransform> </Button.RenderTransform>
</Button> </Button>
</Grid> </Grid>