From 98b9b0d727152c72edaaf948b12cac49e6429de3 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 28 Mar 2017 01:58:02 +0900 Subject: [PATCH] remove Color(MixColor in tizen branch) from Actor Change-Id: I08c7cedaf46da0f3802d7a1eaac79baae36d6a51 Signed-off-by: dongsug.song --- plugins/dali-swig/examples/dali-test.cs | 2 +- plugins/dali-swig/property-wrapper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 plugins/dali-swig/examples/dali-test.cs diff --git a/plugins/dali-swig/examples/dali-test.cs b/plugins/dali-swig/examples/dali-test.cs old mode 100644 new mode 100755 index 6e106ae..2dbe547 --- a/plugins/dali-swig/examples/dali-test.cs +++ b/plugins/dali-swig/examples/dali-test.cs @@ -128,7 +128,7 @@ namespace MyCSharpExample Actor actor = new Actor(); actor.Size = new Position(200.0f, 200.0f, 0.0f); actor.Name = "MyActor"; - actor.Color = new Color(1.0f, 0.0f, 1.0f, 0.8f); + Console.WriteLine("Actor id: {0}", actor.GetId()); Console.WriteLine("Actor size: " + actor.Size.X + ", " + actor.Size.Y); Console.WriteLine("Actor name: " + actor.Name); diff --git a/plugins/dali-swig/property-wrapper.rb b/plugins/dali-swig/property-wrapper.rb index 78cb1f2..179ada4 100755 --- a/plugins/dali-swig/property-wrapper.rb +++ b/plugins/dali-swig/property-wrapper.rb @@ -314,7 +314,7 @@ def writeCSharpData #exception case <<< #Tooltip gives swig build error - if( property.name == "Tooltip" ) + if( property.name == "Tooltip" || property.name == "Color") next end #exception case >>> -- 2.7.4