[ElmSharp.Wearable] Fix Invalid Handle

Fix CircleHandle in CircleSpinner.
Fix Handle to CircleHandle in CircleScroller.IsEnabled.

Change-Id: I8f722975e3d1469352a3d5791c6ef947f01f2a89

diff --git a/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleDatetimeSelector.cs b/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleDatetimeSelector.cs
index 28a8f894613eaf5dce6865c58bb8ff9edde13b8c..475c7c1a163a07120e222e4e15d02eed58134f91 100644 (file)
--- a/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleDatetimeSelector.cs
+++ b/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleDatetimeSelector.cs
@@ -144,7 +144,7 @@ namespace ElmSharp.Wearable
         {
             var handle = base.CreateHandle(parent);
 
-            _circleHandle = Interop.Eext.eext_circle_object_datetime_add(RealHandle == IntPtr.Zero ? Handle : RealHandle , CircleSurface.Handle);
+            _circleHandle = Interop.Eext.eext_circle_object_datetime_add(RealHandle == IntPtr.Zero ? handle : RealHandle , CircleSurface.Handle);
 
             return handle;
         }

diff --git a/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleGenList.cs b/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleGenList.cs
index 7dc18e1586314ed0775a2a34ec48c0ea58e63b70..813c4c6c632b7ce6012da04f520eb46e95277eee 100644 (file)
--- a/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleGenList.cs
+++ b/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleGenList.cs
@@ -213,7 +213,7 @@ namespace ElmSharp.Wearable
         protected override IntPtr CreateHandle(EvasObject parent)
         {
             var handle = base.CreateHandle(parent);
-            _circleHandle = Interop.Eext.eext_circle_object_genlist_add(RealHandle == IntPtr.Zero ? Handle : RealHandle, CircleSurface.Handle);
+            _circleHandle = Interop.Eext.eext_circle_object_genlist_add(RealHandle == IntPtr.Zero ? handle : RealHandle, CircleSurface.Handle);
 
             return handle;
         }

diff --git a/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleScroller.cs b/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleScroller.cs
index 7eaf30795a1e6043335ad6452f35d27ac361c648..7ce56f899cfb7b34dfd31467408b67d74929ac4a 100644 (file)
--- a/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleScroller.cs
+++ b/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleScroller.cs
@@ -79,11 +79,11 @@ namespace ElmSharp.Wearable
         {
             get
             {
-                return !Interop.Eext.eext_circle_object_disabled_get(Handle);
+                return !Interop.Eext.eext_circle_object_disabled_get(CircleHandle);
             }
             set
             {
-                Interop.Eext.eext_circle_object_disabled_set(Handle, !value);
+                Interop.Eext.eext_circle_object_disabled_set(CircleHandle, !value);
             }
         }
 
@@ -339,7 +339,7 @@ namespace ElmSharp.Wearable
         protected override IntPtr CreateHandle(EvasObject parent)
         {
             IntPtr handle = base.CreateHandle(parent);
-            _circleHandle = Interop.Eext.eext_circle_object_scroller_add(RealHandle == IntPtr.Zero ? Handle : RealHandle, CircleSurface.Handle);
+            _circleHandle = Interop.Eext.eext_circle_object_scroller_add(RealHandle == IntPtr.Zero ? handle : RealHandle, CircleSurface.Handle);
             return handle;
         }
     }

diff --git a/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleSpinner.cs b/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleSpinner.cs
index 8a39ce527db5f720d9f843e20eee2e6de5feeca6..0c62a7ca84ca659274e0af5e0eed1868ed42ae18 100644 (file)
--- a/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleSpinner.cs
+++ b/src/ElmSharp.Wearable/ElmSharp.Wearable/CircleSpinner.cs
@@ -57,7 +57,7 @@ namespace ElmSharp.Wearable
         /// <summary>
         /// Gets the handle for Circle Widget.
         /// </summary>
-        public virtual IntPtr CircleHandle => RealHandle;
+        public virtual IntPtr CircleHandle => _circleHandle;
 
         /// <summary>
         /// Gets the handle for Circle Surface used in this widget
@@ -161,7 +161,7 @@ namespace ElmSharp.Wearable
         protected override IntPtr CreateHandle(EvasObject parent)
         {
             IntPtr handle = base.CreateHandle(parent);
-            _circleHandle = Interop.Eext.eext_circle_object_spinner_add(RealHandle == IntPtr.Zero ? Handle : RealHandle, CircleSurface.Handle);
+            _circleHandle = Interop.Eext.eext_circle_object_spinner_add(RealHandle == IntPtr.Zero ? handle : RealHandle, CircleSurface.Handle);
             return handle;
         }
     }