feat: sync upstream.
This commit is contained in:
parent
35abc7445f
commit
2bf3104816
@ -12,6 +12,7 @@
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
BringIntoViewOnFocusChange="True"
|
||||
HorizontalScrollBarVisibility="Hidden"
|
||||
VerticalScrollBarVisibility="Hidden">
|
||||
<ItemsPresenter
|
||||
@ -65,8 +66,7 @@
|
||||
Name="Container"
|
||||
Width="{DynamicResource CarouselIndicatorLineWidth}"
|
||||
Height="{DynamicResource CarouselIndicatorLineHeight}"
|
||||
Background="{TemplateBinding Background}">
|
||||
</Border>
|
||||
Background="{TemplateBinding Background}" />
|
||||
</Border>
|
||||
</Panel>
|
||||
</ControlTemplate>
|
||||
@ -89,8 +89,7 @@
|
||||
<ControlTemplate TargetType="ListBoxItem">
|
||||
<Panel Background="Transparent">
|
||||
<Border Padding="2,0" Background="Transparent">
|
||||
<Border Width="{DynamicResource CarouselIndicatorColumnarWidth}"
|
||||
Height="{DynamicResource CarouselIndicatorColumnarSelectedHeight}">
|
||||
<Border Width="{DynamicResource CarouselIndicatorColumnarWidth}" Height="{DynamicResource CarouselIndicatorColumnarSelectedHeight}">
|
||||
<Rectangle
|
||||
Name="Container"
|
||||
Width="{DynamicResource CarouselIndicatorColumnarWidth}"
|
||||
@ -99,7 +98,7 @@
|
||||
Fill="{TemplateBinding Background}">
|
||||
<Rectangle.Transitions>
|
||||
<Transitions>
|
||||
<DoubleTransition Property="Height" Duration="0:0:0.2"></DoubleTransition>
|
||||
<DoubleTransition Property="Height" Duration="0:0:0.2" />
|
||||
</Transitions>
|
||||
</Rectangle.Transitions>
|
||||
</Rectangle>
|
||||
|
@ -10,6 +10,7 @@
|
||||
<Setter Property="ContextMenu.MaxWidth" Value="{DynamicResource MenuFlyoutMaxWidth}" />
|
||||
<Setter Property="ContextMenu.MinHeight" Value="{DynamicResource MenuFlyoutMinHeight}" />
|
||||
<Setter Property="ContextMenu.Padding" Value="{DynamicResource MenuFlyoutPadding}" />
|
||||
<Setter Property="Focusable" Value="True"></Setter>
|
||||
<Setter Property="ContextMenu.HorizontalAlignment" Value="Stretch" />
|
||||
<Setter Property="TextBlock.FontWeight" Value="Normal" />
|
||||
<Setter Property="ContextMenu.WindowManagerAddShadowHint" Value="False" />
|
||||
|
@ -5,7 +5,6 @@
|
||||
|
||||
<MenuFlyout x:Key="SelectableTextBlockContextFlyout" Placement="Bottom">
|
||||
<MenuItem
|
||||
x:Name="SelectableTextBlockContextFlyoutCopyItem"
|
||||
Command="{Binding $parent[SelectableTextBlock].Copy}"
|
||||
Header="{DynamicResource STRING_MENU_COPY}"
|
||||
InputGesture="{x:Static TextBox.CopyGesture}"
|
||||
|
@ -4,19 +4,16 @@
|
||||
x:CompileBindings="True">
|
||||
<MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
|
||||
<MenuItem
|
||||
x:Name="TextBoxContextFlyoutCutItem"
|
||||
Command="{Binding $parent[TextBox].Cut}"
|
||||
Header="{DynamicResource STRING_MENU_CUT}"
|
||||
InputGesture="{x:Static TextBox.CutGesture}"
|
||||
IsEnabled="{Binding $parent[TextBox].CanCut}" />
|
||||
<MenuItem
|
||||
x:Name="TextBoxContextFlyoutCopyItem"
|
||||
Command="{Binding $parent[TextBox].Copy}"
|
||||
Header="{DynamicResource STRING_MENU_COPY}"
|
||||
InputGesture="{x:Static TextBox.CopyGesture}"
|
||||
IsEnabled="{Binding $parent[TextBox].CanCopy}" />
|
||||
<MenuItem
|
||||
x:Name="TextBoxContextFlyoutPasteItem"
|
||||
Command="{Binding $parent[TextBox].Paste}"
|
||||
Header="{DynamicResource STRING_MENU_PASTE}"
|
||||
InputGesture="{x:Static TextBox.PasteGesture}"
|
||||
|
Loading…
x
Reference in New Issue
Block a user