Browse Source
Merge branch 'master' into refactor/other-controls-itemssource
pull/10831/head
Max Katz
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
3 additions and
18 deletions
-
src/Avalonia.Controls/RadioButton.cs
-
src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
-
src/Avalonia.Themes.Simple/Controls/TextBox.xaml
|
|
|
@ -86,7 +86,7 @@ namespace Avalonia.Controls |
|
|
|
continue; |
|
|
|
} |
|
|
|
if (current != radioButton && current.IsChecked.GetValueOrDefault()) |
|
|
|
current.IsChecked = false; |
|
|
|
current.SetCurrentValue(IsCheckedProperty, false); |
|
|
|
i++; |
|
|
|
} |
|
|
|
if (group.Count == 0) |
|
|
|
@ -193,7 +193,7 @@ namespace Avalonia.Controls |
|
|
|
foreach (var sibling in siblings) |
|
|
|
{ |
|
|
|
if (sibling.IsChecked.GetValueOrDefault()) |
|
|
|
sibling.IsChecked = false; |
|
|
|
sibling.SetCurrentValue(IsCheckedProperty, false); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -1,4 +1,4 @@ |
|
|
|
<ResourceDictionary xmlns="https://github.com/avaloniaui" |
|
|
|
<ResourceDictionary xmlns="https://github.com/avaloniaui" |
|
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> |
|
|
|
<Design.PreviewWith> |
|
|
|
<Border Padding="20"> |
|
|
|
@ -26,12 +26,6 @@ |
|
|
|
<MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/> |
|
|
|
</MenuFlyout> |
|
|
|
|
|
|
|
<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}"/> |
|
|
|
<MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/> |
|
|
|
</ContextMenu> |
|
|
|
|
|
|
|
<ControlTheme x:Key="FluentTextBoxButton" TargetType="Button"> |
|
|
|
<Setter Property="Background" Value="{DynamicResource TextControlButtonBackground}" /> |
|
|
|
<Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrush}" /> |
|
|
|
|
|
|
|
@ -13,15 +13,6 @@ |
|
|
|
IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}" /> |
|
|
|
</MenuFlyout> |
|
|
|
|
|
|
|
<ContextMenu x:Key="SimpleTextBoxContextMenu" 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}" /> |
|
|
|
<MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" |
|
|
|
IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}" /> |
|
|
|
</ContextMenu> |
|
|
|
|
|
|
|
<ControlTheme x:Key="SimpleTextBoxClearButtonTheme" |
|
|
|
BasedOn="{StaticResource {x:Type Button}}" |
|
|
|
TargetType="Button"> |
|
|
|
|