Browse Source
Merge pull request #5822 from AvaloniaUI/fixes/do-not-obsolete-context-menu-api
dont obsolete context menu apis.
pull/5407/head
Steven Kirk
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
0 additions and
4 deletions
-
src/Avalonia.Controls/Control.cs
-
src/Avalonia.Themes.Default/TextBox.xaml
-
src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
|
|
|
@ -37,7 +37,6 @@ namespace Avalonia.Controls |
|
|
|
/// <summary>
|
|
|
|
/// Defines the <see cref="ContextMenu"/> property.
|
|
|
|
/// </summary>
|
|
|
|
[Obsolete("Prefer ContextFlyout")] |
|
|
|
public static readonly StyledProperty<ContextMenu?> ContextMenuProperty = |
|
|
|
AvaloniaProperty.Register<Control, ContextMenu?>(nameof(ContextMenu)); |
|
|
|
|
|
|
|
@ -77,7 +76,6 @@ namespace Avalonia.Controls |
|
|
|
/// <summary>
|
|
|
|
/// Gets or sets a context menu to the control.
|
|
|
|
/// </summary>
|
|
|
|
[Obsolete("Prefer ContextFlyout")] |
|
|
|
public ContextMenu? ContextMenu |
|
|
|
{ |
|
|
|
get => GetValue(ContextMenuProperty); |
|
|
|
|
|
|
|
@ -10,7 +10,6 @@ |
|
|
|
<MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/> |
|
|
|
</MenuFlyout> |
|
|
|
|
|
|
|
<!-- ContextMenu obsolete, prefer ContextFlyout --> |
|
|
|
<ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu"> |
|
|
|
<MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" /> |
|
|
|
<MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/> |
|
|
|
|
|
|
|
@ -21,7 +21,6 @@ |
|
|
|
<MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/> |
|
|
|
</MenuFlyout> |
|
|
|
|
|
|
|
<!-- ContextMenu obsolete, prefer ContextFlyout --> |
|
|
|
<ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu"> |
|
|
|
<MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" /> |
|
|
|
<MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/> |
|
|
|
|