[NUI] modify GetHashCode() (#654)
authorhuiyueun <35286162+huiyueun@users.noreply.github.com>
Wed, 16 Jan 2019 05:17:33 +0000 (14:17 +0900)
committerdongsug-song <35130733+dongsug-song@users.noreply.github.com>
Wed, 16 Jan 2019 05:17:33 +0000 (14:17 +0900)
Change-Id: Ib642ba64e746fb811be7a5e7e2cb4e82d5c6eb8a
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
23 files changed:
src/Tizen.NUI/src/internal/Layouting/LayoutLength.cs
src/Tizen.NUI/src/internal/Layouting/LayoutMeasureSpec.cs
src/Tizen.NUI/src/internal/Layouting/MeasuredSize.cs
src/Tizen.NUI/src/internal/XamlBinding/TemplateUtilities.cs
src/Tizen.NUI/src/public/Position.cs
src/Tizen.NUI/src/public/Position2D.cs
src/Tizen.NUI/src/public/RelativeVector2.cs
src/Tizen.NUI/src/public/RelativeVector3.cs
src/Tizen.NUI/src/public/RelativeVector4.cs
src/Tizen.NUI/src/public/Size.cs
src/Tizen.NUI/src/public/Size2D.cs
src/Tizen.NUI/src/public/Vector2.cs
src/Tizen.NUI/src/public/Vector3.cs
src/Tizen.NUI/src/public/Vector4.cs
src/Tizen.NUI/src/public/Window.cs
src/Tizen.NUI/src/public/XamlBinding/Element.cs
test/NUITestSample/NUIXAMLTestSample/res/images/Backward.png [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/images/Forward.png [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/images/Pause.png [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/images/icon-play.png [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/layout/VideoViewPage.xaml [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/videos/demoVideo.mp4 [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/videos/sample.wav [new file with mode: 0755]

index 91567b8..b1013bf 100755 (executable)
@@ -192,7 +192,7 @@ namespace Tizen.NUI
         /// <since_tizen> 5 </since_tizen>
         public override int GetHashCode()
         {
-            return Value.GetHashCode();
+            return swigCPtr.GetHashCode();
         }
 
         private bool EqualTo(LayoutLength rhs)
index fdecacf..e313f1c 100755 (executable)
@@ -104,7 +104,7 @@ namespace Tizen.NUI
         /// <since_tizen> 5 </since_tizen>
         public override int GetHashCode()
         {
-            return Mode.GetHashCode();
+            return swigCPtr.GetHashCode();
         }
 
         private bool EqualTo(LayoutMeasureSpec value)
index 58db9a9..e29f9e3 100755 (executable)
@@ -154,7 +154,7 @@ namespace Tizen.NUI
         /// <since_tizen> 5 </since_tizen>
         public override int GetHashCode()
         {
-            return State.GetHashCode();
+            return swigCPtr.GetHashCode();
         }
 
         private bool EqualTo(MeasuredSize value)
index 06f3e24..75c653b 100755 (executable)
@@ -46,16 +46,6 @@ namespace Tizen.NUI.Binding
 
         public static void OnContentChanged(BindableObject bindable, object oldValue, object newValue)
         {
-       /*
-            var self = (IControlTemplated)bindable;
-            var newElement = (Element)newValue;
-            var oldElement = (Element)oldValue;
-                       
-            if (newElement == oldElement)
-            {
-                return;
-            }
-           */
         }
 
         public static void OnControlTemplateChanged(BindableObject bindable, object oldValue, object newValue)
index acd93a7..fad2130 100755 (executable)
@@ -797,7 +797,7 @@ namespace Tizen.NUI
         /// <since_tizen> 5 </since_tizen>
         public override int GetHashCode()
         {
-            return X.GetHashCode();
+            return swigCPtr.GetHashCode();
         }
 
         /// <summary>
index e45b84a..3069eb2 100755 (executable)
@@ -314,7 +314,7 @@ namespace Tizen.NUI
         /// <since_tizen> 5 </since_tizen>
         public override int GetHashCode()
         {
-            return X.GetHashCode();
+            return swigCPtr.GetHashCode();
         }
 
         /// <summary>
index 94f2cb8..9763627 100755 (executable)
@@ -300,7 +300,7 @@ namespace Tizen.NUI
         /// <since_tizen> 5 </since_tizen>
         public override int GetHashCode()
         {
-            return X.GetHashCode();
+            return swigCPtr.GetHashCode();
         }
 
         /// <summary>
index aff0c0b..077d350 100755 (executable)
@@ -310,7 +310,7 @@ namespace Tizen.NUI
         /// <since_tizen> 5 </since_tizen>
         public override int GetHashCode()
         {
-            return X.GetHashCode();
+            return swigCPtr.GetHashCode();
         }
 
         /// <summary>
index ec0276f..5826a21 100755 (executable)
@@ -329,7 +329,7 @@ namespace Tizen.NUI
         /// <since_tizen> 5 </since_tizen>
         public override int GetHashCode()
         {
-            return X.GetHashCode();
+            return swigCPtr.GetHashCode();
         }
 
         /// <summary>
index 69d19b3..eb34a86 100755 (executable)
@@ -301,7 +301,7 @@ namespace Tizen.NUI
         /// <since_tizen> 5 </since_tizen>
         public override int GetHashCode()
         {
-            return Zero.GetHashCode();
+            return swigCPtr.GetHashCode();
         }
 
         /// <summary>
index 5df3635..f3bc67e 100755 (executable)
@@ -288,7 +288,7 @@ namespace Tizen.NUI
         /// <since_tizen> 5 </since_tizen>
         public override int GetHashCode()
         {
-            return Width.GetHashCode();
+            return swigCPtr.GetHashCode();
         }
 
         /// <summary>
index 6e7aef1..716d93b 100755 (executable)
@@ -397,7 +397,7 @@ namespace Tizen.NUI
         /// <since_tizen> 5 </since_tizen>
         public override int GetHashCode()
         {
-            return X.GetHashCode();
+            return swigCPtr.GetHashCode();
         }
 
         /// <summary>
index a18f0c1..2253264 100755 (executable)
@@ -522,7 +522,7 @@ namespace Tizen.NUI
         /// <since_tizen> 5 </since_tizen>
         public override int GetHashCode()
         {
-            return X.GetHashCode();
+            return swigCPtr.GetHashCode();
         }
 
         /// <summary>
index b4402e7..61c9c49 100755 (executable)
@@ -538,7 +538,7 @@ namespace Tizen.NUI
         /// <since_tizen> 5 </since_tizen>
         public override int GetHashCode()
         {
-            return X.GetHashCode();
+            return swigCPtr.GetHashCode();
         }
 
         /// <summary>
index e87a41c..72ea43b 100755 (executable)
@@ -1531,7 +1531,7 @@ namespace Tizen.NUI
         private void OnStageKey(IntPtr data)
         {
             KeyEventArgs e = new KeyEventArgs();
-                       e.Key = Tizen.NUI.Key.GetKeyFromPtr(data);
+            e.Key = Tizen.NUI.Key.GetKeyFromPtr(data);
 
 
             if (_stageKeyHandler != null)
index 86149ab..f932e69 100755 (executable)
@@ -606,13 +606,6 @@ namespace Tizen.NUI.Binding
 
         internal static void SetFlowDirectionFromParent(Element child)
         {
-       /*
-            var parentView = child.Parent;
-            if (parentView == null)
-            {
-                return;
-            }
-            */
         }
 
         /// <summary>
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/images/Backward.png b/test/NUITestSample/NUIXAMLTestSample/res/images/Backward.png
new file mode 100755 (executable)
index 0000000..5950716
Binary files /dev/null and b/test/NUITestSample/NUIXAMLTestSample/res/images/Backward.png differ
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/images/Forward.png b/test/NUITestSample/NUIXAMLTestSample/res/images/Forward.png
new file mode 100755 (executable)
index 0000000..dc3b200
Binary files /dev/null and b/test/NUITestSample/NUIXAMLTestSample/res/images/Forward.png differ
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/images/Pause.png b/test/NUITestSample/NUIXAMLTestSample/res/images/Pause.png
new file mode 100755 (executable)
index 0000000..179bca5
Binary files /dev/null and b/test/NUITestSample/NUIXAMLTestSample/res/images/Pause.png differ
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/images/icon-play.png b/test/NUITestSample/NUIXAMLTestSample/res/images/icon-play.png
new file mode 100755 (executable)
index 0000000..9a3aa12
Binary files /dev/null and b/test/NUITestSample/NUIXAMLTestSample/res/images/icon-play.png differ
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/VideoViewPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/VideoViewPage.xaml
new file mode 100755 (executable)
index 0000000..b42c3d1
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="Tizen.NUI.Examples.VideoViewPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+  
+       <VideoView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/videos/demoVideo.mp4"
+         x:Name="VideoView" Name="videoview" ParentOrigin="Center" PivotPoint="Center" Position2D="0,0" Size2D="600, 400" PositionUsesPivotPoint="true" Looping="true" Muted="false" />
+       <TableView x:Name="TableView" Rows="1" Columns="3" CellPadding="20,20" CellHorizontalAlignment="Center" CellVerticalAlignment="Center" Name="tableview" ParentOrigin="Center" PivotPoint="Center" Position2D="0,400" Size2D="600, 120" PositionUsesPivotPoint="true">
+               <PushButton BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/Backward.png" x:Name="ButtonBackward" Name="buttonbackward" ParentOrigin="Center" PivotPoint="Center" Position2D="0,0" Size2D="100, 80" PositionUsesPivotPoint="true" CellIndex="0,0" Clicked="OnClicked" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost"/>
+               <PushButton BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/icon-play.png" x:Name="ButtonPlay" Name="buttonplay" ParentOrigin="Center" PivotPoint="Center" Position2D="0,0" Size2D="100, 80" PositionUsesPivotPoint="true" CellIndex="0,1" Clicked="OnClicked" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost"/>
+               <PushButton BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/Forward.png" x:Name="ButtonForward" Name="buttonforward" ParentOrigin="Center" PivotPoint="Center" Position2D="0,0" Size2D="100, 80" PositionUsesPivotPoint="true" CellIndex="0,2" Clicked="OnClicked" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost"/>
+    </TableView>         
+</ContentPage>
\ No newline at end of file
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/videos/demoVideo.mp4 b/test/NUITestSample/NUIXAMLTestSample/res/videos/demoVideo.mp4
new file mode 100755 (executable)
index 0000000..cd7dcd0
Binary files /dev/null and b/test/NUITestSample/NUIXAMLTestSample/res/videos/demoVideo.mp4 differ
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/videos/sample.wav b/test/NUITestSample/NUIXAMLTestSample/res/videos/sample.wav
new file mode 100755 (executable)
index 0000000..002f815
Binary files /dev/null and b/test/NUITestSample/NUIXAMLTestSample/res/videos/sample.wav differ