Added the ability to do code behind bindings in Forms

KMY520 · Aug 15, 2017 · fbd3090 · fbd3090
1 parent f05dad9
commit fbd3090
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/MvvmCross-Forms/MvvmCross.Forms/Core/IMvxContentPage.cs b/MvvmCross-Forms/MvvmCross.Forms/Core/IMvxContentPage.cs
@@ -1,9 +1,10 @@
-using MvvmCross.Core.ViewModels;
+using MvvmCross.Binding.BindingContext;
+using MvvmCross.Core.ViewModels;
 using MvvmCross.Core.Views;
 
 namespace MvvmCross.Forms.Core
 {
-    public interface IMvxContentPage : IMvxView
+    public interface IMvxContentPage : IMvxView, IMvxBindingContextOwner
     {
         MvxViewModelRequest Request { get; set; }
     }

diff --git a/MvvmCross-Forms/MvvmCross.Forms/Core/MvxContentPage.cs b/MvvmCross-Forms/MvvmCross.Forms/Core/MvxContentPage.cs
@@ -1,4 +1,5 @@
-using MvvmCross.Core.ViewModels;
+using MvvmCross.Binding.BindingContext;
+using MvvmCross.Core.ViewModels;
 using Xamarin.Forms;
 
 namespace MvvmCross.Forms.Core
@@ -7,8 +8,30 @@ public class MvxContentPage : ContentPage, IMvxContentPage
     {
         public object DataContext
         {
-            get { return BindingContext; }
-            set { BindingContext = value; }
+            get
+            {
+                return BindingContext.DataContext;
+            }
+            set
+            {
+                base.BindingContext = value;
+                BindingContext.DataContext = value;
+            }
+        }
+
+        private IMvxBindingContext _bindingContext;
+        public new IMvxBindingContext BindingContext
+        {
+            get
+            {
+                if (_bindingContext == null)
+                    BindingContext = new MvxBindingContext(base.BindingContext);
+                return _bindingContext;
+            }
+            set
+            {
+                _bindingContext = value;
+            }
         }
 
         public IMvxViewModel ViewModel