Merge "Fixd handle issue and interop function" into tizen

5 files changed, 56 insertions, 3 deletions

diff --git a/ElmSharp.Test/ElmSharp.Test.csproj b/ElmSharp.Test/ElmSharp.Test.csproj
index 06513cc..0333f12 100755
--- a/ElmSharp.Test/ElmSharp.Test.csproj
+++ b/ElmSharp.Test/ElmSharp.Test.csproj
@@ -44,6 +44,7 @@
     <Compile Include="TC\BackgroundTest2.cs" />
     <Compile Include="TC\BackgroundTest3.cs" />
     <Compile Include="TC\GenListTest10.cs" />
+    <Compile Include="TC\LabelTest4.cs" />
     <Compile Include="TC\MultibuttonEntryTest1.cs" />
     <Compile Include="TC\DateTimeSelectorTest2.cs" />
     <Compile Include="TC\EntryTest2.cs" />
diff --git a/ElmSharp.Test/TC/LabelTest1.cs b/ElmSharp.Test/TC/LabelTest1.cs
index fb5118b..d09b8ff 100644
--- a/ElmSharp.Test/TC/LabelTest1.cs
+++ b/ElmSharp.Test/TC/LabelTest1.cs
@@ -33,6 +33,7 @@ namespace ElmSharp.Test
             bg.Show();
 
             Label label1 = new Label(window);
+            label1.Color = Color.Black;
             label1.Text = "Label Test!!!";
 
             label1.Show();
diff --git a/ElmSharp.Test/TC/LabelTest4.cs b/ElmSharp.Test/TC/LabelTest4.cs
new file mode 100644
index 0000000..c7dab02
--- /dev/null
+++ b/ElmSharp.Test/TC/LabelTest4.cs
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using ElmSharp;
+using System.Collections.Generic;
+
+namespace ElmSharp.Test
+{
+    public class LabelTest4 : TestCaseBase
+    {
+        public override string TestName => "LabelTest4";
+        public override string TestDescription => "To test slide Animation of Label";
+
+        public override void Run(Window window)
+        {
+            Background bg = new Background(window);
+            bg.Color = Color.White;
+            bg.Move(0, 0);
+            bg.Resize(window.ScreenSize.Width, window.ScreenSize.Height);
+            bg.Show();
+
+            Label label1 = new Label(window)
+            {
+                Style = "slide_long",
+                SlideDuration = 3,
+                SlideMode = LabelSlideMode.Always,
+                Color = Color.Black,
+                Text = "Lab test12345678"
+            };
+
+            label1.Show();
+            label1.Resize(200, 30);
+            label1.Move(0, 0);
+            label1.PlaySlide();
+        }
+    }
+}
diff --git a/ElmSharp/ElmSharp/EvasObject.cs b/ElmSharp/ElmSharp/EvasObject.cs
index 564cb82..f885c0b 100755
--- a/ElmSharp/ElmSharp/EvasObject.cs
+++ b/ElmSharp/ElmSharp/EvasObject.cs
@@ -116,7 +116,7 @@ namespace ElmSharp
                 if (_renderPostCallback == null)
                 {
                     _renderPostCallback = new Interop.Evas.EvasCallback((o, e, d) => _renderPost?.Invoke(this, EventArgs.Empty));
-                    Interop.Evas.evas_event_callback_add(Interop.Evas.evas_object_evas_get(Handle), Interop.Evas.ObjectCallbackType.RenderPost, _renderPostCallback, IntPtr.Zero);
+                    Interop.Evas.evas_event_callback_add(Interop.Evas.evas_object_evas_get(RealHandle), Interop.Evas.ObjectCallbackType.RenderPost, _renderPostCallback, IntPtr.Zero);
                 }
             }
             remove
@@ -124,7 +124,7 @@ namespace ElmSharp
                 _renderPost -= value;
                 if (_renderPost?.GetInvocationList().Length == 0)
                 {
-                    Interop.Evas.evas_event_callback_del(Interop.Evas.evas_object_evas_get(Handle), Interop.Evas.ObjectCallbackType.RenderPost, _renderPostCallback);
+                    Interop.Evas.evas_event_callback_del(Interop.Evas.evas_object_evas_get(RealHandle), Interop.Evas.ObjectCallbackType.RenderPost, _renderPostCallback);
                     _renderPostCallback = null;
                 }
             }
diff --git a/ElmSharp/Interop/Interop.Elementary.cs b/ElmSharp/Interop/Interop.Elementary.cs
index 98d5978..0bffbe5 100755
--- a/ElmSharp/Interop/Interop.Elementary.cs
+++ b/ElmSharp/Interop/Interop.Elementary.cs
@@ -22,7 +22,7 @@ internal static partial class Interop
     internal static partial class Elementary
     {
         [DllImport(Libraries.Elementary)]
-        internal static extern double elm_config_scroll_bring_in_scroll_friction_set(double time);
+        internal static extern void elm_config_scroll_bring_in_scroll_friction_set(double time);
 
         [DllImport(Libraries.Elementary)]
         internal static extern double elm_config_scroll_bring_in_scroll_friction_get();