summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Core/Button.cs
diff options
context:
space:
mode:
authorRui Marinho <me@ruimarinho.net>2016-09-13 12:34:22 +0100
committerRui Marinho <me@ruimarinho.net>2016-09-13 12:34:22 +0100
commitc92f079ad910448aa72ca6af9775a78895f3da65 (patch)
treeafbfa7e9856c67e951ebf119c8d53573d9c36ae8 /Xamarin.Forms.Core/Button.cs
parent506a787b60aafd74f0cc457f6fe484577e658f54 (diff)
downloadxamarin-forms-c92f079ad910448aa72ca6af9775a78895f3da65.tar.gz
xamarin-forms-c92f079ad910448aa72ca6af9775a78895f3da65.tar.bz2
xamarin-forms-c92f079ad910448aa72ca6af9775a78895f3da65.zip
Revert "[C] Prevent enabling a Button via setting a Command (#308)"
This reverts commit 368a375f13fc2e4b5ff00dbbdd7a2d6bb53988eb.
Diffstat (limited to 'Xamarin.Forms.Core/Button.cs')
-rw-r--r--Xamarin.Forms.Core/Button.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/Xamarin.Forms.Core/Button.cs b/Xamarin.Forms.Core/Button.cs
index a4dffc78..31573076 100644
--- a/Xamarin.Forms.Core/Button.cs
+++ b/Xamarin.Forms.Core/Button.cs
@@ -180,7 +180,7 @@ namespace Xamarin.Forms
void CommandCanExecuteChanged(object sender, EventArgs eventArgs)
{
ICommand cmd = Command;
- if (cmd != null && IsEnabled)
+ if (cmd != null)
IsEnabledCore = cmd.CanExecute(CommandParameter);
}
@@ -225,6 +225,8 @@ namespace Xamarin.Forms
Command.CanExecuteChanged += CommandCanExecuteChanged;
CommandCanExecuteChanged(this, EventArgs.Empty);
}
+ else
+ IsEnabledCore = true;
}
void OnSourceChanged(object sender, EventArgs eventArgs)