projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add PIXEL_SIZE and ELLIPSIS property in text-controls" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-sharp
/
sharp
/
internal
/
Stage.cs
diff --git
a/plugins/dali-sharp/sharp/internal/Stage.cs
b/plugins/dali-sharp/sharp/internal/Stage.cs
index
2f8a6d2
..
3eef0a5
100644
(file)
--- a/
plugins/dali-sharp/sharp/internal/Stage.cs
+++ b/
plugins/dali-sharp/sharp/internal/Stage.cs
@@
-482,16
+482,16
@@
public class Stage : BaseHandle {
public void AddLayer(Layer layer)
{
public void AddLayer(Layer layer)
{
- this.Add( (Actor)layer );
+ NDalicPINVOKE.Stage_Add(swigCPtr, Layer.getCPtr(layer));
+ if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
public void RemoveLayer(Layer layer)
{
}
public void RemoveLayer(Layer layer)
{
- this.Remove( (Actor)layer );
+ NDalicPINVOKE.Stage_Remove(swigCPtr, Layer.getCPtr(layer));
+ if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
}
-
-
public static Vector4 DEFAULT_BACKGROUND_COLOR {
get {
global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEFAULT_BACKGROUND_COLOR_get();
public static Vector4 DEFAULT_BACKGROUND_COLOR {
get {
global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEFAULT_BACKGROUND_COLOR_get();
@@
-536,13
+536,13
@@
public class Stage : BaseHandle {
return ret;
}
return ret;
}
- public void Add(
Actor actor
) {
- NDalicPINVOKE.Stage_Add(swigCPtr,
Actor.getCPtr(actor
));
+ public void Add(
View view
) {
+ NDalicPINVOKE.Stage_Add(swigCPtr,
View.getCPtr(view
));
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
- public void Remove(
Actor actor
) {
- NDalicPINVOKE.Stage_Remove(swigCPtr,
Actor.getCPtr(actor
));
+ public void Remove(
View view
) {
+ NDalicPINVOKE.Stage_Remove(swigCPtr,
View.getCPtr(view
));
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}