Revert "[C] Prevent enabling a Button via setting a Command (#308)"

This reverts commit 368a375.
xamarin · Sep 13, 2016 · c92f079 · c92f079
1 parent 506a787
commit c92f079
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 58 deletions.
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43354.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43354.cs
diff --git a/...ssues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/...ssues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -124,7 +124,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla42364.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla42519.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla43516.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Bugzilla43354.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)CarouselAsync.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla34561.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla34727.cs" />

diff --git a/Xamarin.Forms.Core/Button.cs b/Xamarin.Forms.Core/Button.cs
@@ -180,7 +180,7 @@ protected override void OnPropertyChanging(string propertyName = null)
 		void CommandCanExecuteChanged(object sender, EventArgs eventArgs)
 		{
 			ICommand cmd = Command;
-			if (cmd != null && IsEnabled)
+			if (cmd != null)
 				IsEnabledCore = cmd.CanExecute(CommandParameter);
 		}
 
@@ -225,6 +225,8 @@ void OnCommandChanged()
 				Command.CanExecuteChanged += CommandCanExecuteChanged;
 				CommandCanExecuteChanged(this, EventArgs.Empty);
 			}
+			else
+				IsEnabledCore = true;
 		}
 
 		void OnSourceChanged(object sender, EventArgs eventArgs)