diff --git a/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs b/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs index b0dff8ea..b65ed7b6 100644 --- a/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs +++ b/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs @@ -92,13 +92,11 @@ namespace LibationAvalonia.Controls base.UpdateDataValidation(property, state, error); if (property == CommandProperty) { - if (state == BindingValueType.BindingError) + var canExecure = !state.HasFlag(BindingValueType.HasError); + if (canExecure != _commandCanExecute) { - if (_commandCanExecute) - { - _commandCanExecute = false; - UpdateIsEffectivelyEnabled(); - } + _commandCanExecute = canExecure; + UpdateIsEffectivelyEnabled(); } } } diff --git a/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml index 2994870c..57749c32 100644 --- a/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml +++ b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml @@ -6,24 +6,28 @@ Width="800" Height="450" x:Class="LibationAvalonia.Dialogs.EditTemplateDialog" xmlns:dialogs="clr-namespace:LibationAvalonia.Dialogs" + xmlns:controls="clr-namespace:LibationAvalonia.Controls" + x:DataType="dialogs:EditTemplateDialog+EditTemplateViewModel" Title="EditTemplateDialog"> - + + ColumnDefinitions="*,Auto" + Margin="0,0,0,10"> + Margin="0,0,0,10" + Text="{CompiledBinding Description}" /> + Text="{CompiledBinding UserTemplateText, Mode=TwoWay}" />