X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fdali-sharp%2Fsharp%2Finternal%2FViewWrapperImpl.cs;h=bf473d54945508e8ba0ddb0fa339bb76e4d8224c;hb=b904b864bc3875b6cb0bdfa2ad430d094c140205;hp=145ab54e13eaa33cee3e649423dca8a7efa5c77a;hpb=d375dceca213569317d81d17cd2d2a4b45122cda;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs b/plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs index 145ab54..bf473d5 100644 --- a/plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs +++ b/plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs @@ -17,13 +17,13 @@ namespace Dali { - public sealed class ViewWrapperImpl : ViewImpl + internal sealed class ViewWrapperImpl : ViewImpl { private global::System.Runtime.InteropServices.HandleRef swigCPtr; public delegate void OnStageConnectionDelegate(int depth); public delegate void OnStageDisconnectionDelegate(); - public delegate void OnChildAddDelegate(Actor actor); - public delegate void OnChildRemoveDelegate(Actor actor); + public delegate void OnChildAddDelegate(View view); + public delegate void OnChildRemoveDelegate(View view); public delegate void OnPropertySetDelegate(int index, Property.Value propertyValue); public delegate void OnSizeSetDelegate(Vector3 targetSize); public delegate void OnSizeAnimationDelegate(Animation animation, Vector3 targetSize); @@ -34,26 +34,26 @@ namespace Dali public delegate void OnRelayoutDelegate(Vector2 size, RelayoutContainer container); public delegate void OnSetResizePolicyDelegate(ResizePolicyType policy, DimensionType dimension); public delegate Vector3 GetNaturalSizeDelegate(); - public delegate float CalculateChildSizeDelegate(Actor child, DimensionType dimension); + public delegate float CalculateChildSizeDelegate(View child, DimensionType dimension); public delegate float GetHeightForWidthDelegate(float width); public delegate float GetWidthForHeightDelegate(float height); public delegate bool RelayoutDependentOnChildrenDimensionDelegate(DimensionType dimension); public delegate bool RelayoutDependentOnChildrenDelegate(); public delegate void OnCalculateRelayoutSizeDelegate(DimensionType dimension); public delegate void OnLayoutNegotiatedDelegate(float size, DimensionType dimension); - public delegate void OnControlChildAddDelegate(Actor child); - public delegate void OnControlChildRemoveDelegate(Actor child); + public delegate void OnControlChildAddDelegate(View child); + public delegate void OnControlChildRemoveDelegate(View child); public delegate void OnStyleChangeDelegate(StyleManager styleManager, StyleChangeType change); public delegate bool OnAccessibilityActivatedDelegate(); public delegate bool OnAccessibilityPanDelegate(PanGesture gestures); public delegate bool OnAccessibilityTouchDelegate(Touch touch); public delegate bool OnAccessibilityValueChangeDelegate(bool isIncrease); public delegate bool OnAccessibilityZoomDelegate(); - public delegate void OnKeyInputFocusGainedDelegate(); - public delegate void OnKeyInputFocusLostDelegate(); - public delegate Actor GetNextKeyboardFocusableActorDelegate(Actor currentFocusedActor, View.KeyboardFocus.Direction direction, bool loopEnabled); - public delegate void OnKeyboardFocusChangeCommittedDelegate(Actor commitedFocusableActor); - public delegate bool OnKeyboardEnterDelegate(); + public delegate void OnFocusGainedDelegate(); + public delegate void OnFocusLostDelegate(); + public delegate View GetNextFocusableActorDelegate(View currentFocusedActor, View.Focus.Direction direction, bool loopEnabled); + public delegate void OnFocusChangeCommittedDelegate(View commitedFocusableActor); + public delegate bool OnFocusEnterDelegate(); public delegate void OnPinchDelegate(PinchGesture pinch); public delegate void OnPanDelegate(PanGesture pan); public delegate void OnTapDelegate(TapGesture tap); @@ -88,11 +88,11 @@ namespace Dali public OnAccessibilityTouchDelegate OnAccessibilityTouch; public OnAccessibilityValueChangeDelegate OnAccessibilityValueChange; public OnAccessibilityZoomDelegate OnAccessibilityZoom; - public OnKeyInputFocusGainedDelegate OnKeyInputFocusGained; - public OnKeyInputFocusLostDelegate OnKeyInputFocusLost; - public GetNextKeyboardFocusableActorDelegate GetNextKeyboardFocusableActor; - public OnKeyboardFocusChangeCommittedDelegate OnKeyboardFocusChangeCommitted; - public OnKeyboardEnterDelegate OnKeyboardEnter; + public OnFocusGainedDelegate OnFocusGained; + public OnFocusLostDelegate OnFocusLost; + public GetNextFocusableActorDelegate GetNextFocusableActor; + public OnFocusChangeCommittedDelegate OnFocusChangeCommitted; + public OnFocusEnterDelegate OnFocusEnter; public OnPinchDelegate OnPinch; public OnPanDelegate OnPan; public OnTapDelegate OnTap; @@ -115,7 +115,7 @@ namespace Dali public override void Dispose() { - if (!Stage.IsInstalled()) + if (!Window.IsInstalled()) { DisposeQueue.Instance.Add(this); return; @@ -137,7 +137,7 @@ namespace Dali } } - public ViewWrapperImpl(ViewWrapperImpl.CustomViewBehaviour behaviourFlags) : this(NDalicManualPINVOKE.new_ViewWrapperImpl((int)behaviourFlags), true) + public ViewWrapperImpl(CustomViewBehaviour behaviourFlags) : this(NDalicManualPINVOKE.new_ViewWrapperImpl((int)behaviourFlags), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); DirectorConnect(); @@ -170,9 +170,9 @@ namespace Dali return ret; } - public float CalculateChildSizeBase(Actor child, DimensionType dimension) + public float CalculateChildSizeBase(View child, DimensionType dimension) { - float ret = NDalicManualPINVOKE.ViewWrapperImpl_CalculateChildSizeBase(swigCPtr, Actor.getCPtr(child), (int)dimension); + float ret = NDalicManualPINVOKE.ViewWrapperImpl_CalculateChildSizeBase(swigCPtr, View.getCPtr(child), (int)dimension); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -236,7 +236,7 @@ namespace Dali return ret; } - public void EmitKeyInputFocusSignal(bool focusGained) + public void EmitFocusSignal(bool focusGained) { NDalicManualPINVOKE.ViewWrapperImpl_EmitKeyInputFocusSignal(swigCPtr, focusGained); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -280,11 +280,11 @@ namespace Dali Delegate27 = new DelegateViewWrapperImpl_27(DirectorOnAccessibilityTouch); Delegate28 = new DelegateViewWrapperImpl_28(DirectorOnAccessibilityValueChange); Delegate29 = new DelegateViewWrapperImpl_29(DirectorOnAccessibilityZoom); - Delegate30 = new DelegateViewWrapperImpl_30(DirectorOnKeyInputFocusGained); - Delegate31 = new DelegateViewWrapperImpl_31(DirectorOnKeyInputFocusLost); - Delegate32 = new DelegateViewWrapperImpl_32(DirectorGetNextKeyboardFocusableActor); - Delegate33 = new DelegateViewWrapperImpl_33(DirectorOnKeyboardFocusChangeCommitted); - Delegate34 = new DelegateViewWrapperImpl_34(DirectorOnKeyboardEnter); + Delegate30 = new DelegateViewWrapperImpl_30(DirectorOnFocusGained); + Delegate31 = new DelegateViewWrapperImpl_31(DirectorOnFocusLost); + Delegate32 = new DelegateViewWrapperImpl_32(DirectorGetNextFocusableActor); + Delegate33 = new DelegateViewWrapperImpl_33(DirectorOnFocusChangeCommitted); + Delegate34 = new DelegateViewWrapperImpl_34(DirectorOnFocusEnter); Delegate35 = new DelegateViewWrapperImpl_35(DirectorOnPinch); Delegate36 = new DelegateViewWrapperImpl_36(DirectorOnPan); Delegate37 = new DelegateViewWrapperImpl_37(DirectorOnTap); @@ -304,12 +304,12 @@ namespace Dali private void DirectorOnChildAdd(global::System.IntPtr child) { - OnChildAdd(new Actor(child, false)); + OnChildAdd(new View(child, false)); } private void DirectorOnChildRemove(global::System.IntPtr child) { - OnChildRemove(new Actor(child, false)); + OnChildRemove(new View(child, false)); } private void DirectorOnPropertySet(int index, global::System.IntPtr propertyValue) @@ -367,7 +367,7 @@ namespace Dali private float DirectorCalculateChildSize(global::System.IntPtr child, int dimension) { - return CalculateChildSize(new Actor(child, false), (DimensionType)dimension); + return CalculateChildSize(new View(child, false), (DimensionType)dimension); } private float DirectorGetHeightForWidth(float width) @@ -406,12 +406,12 @@ namespace Dali private void DirectorOnControlChildAdd(global::System.IntPtr child) { - OnControlChildAdd(new Actor(child, false)); + OnControlChildAdd(new View(child, false)); } private void DirectorOnControlChildRemove(global::System.IntPtr child) { - OnControlChildRemove(new Actor(child, false)); + OnControlChildRemove(new View(child, false)); } private void DirectorOnStyleChange(global::System.IntPtr styleManager, int change) @@ -447,29 +447,29 @@ namespace Dali return OnAccessibilityZoom(); } - private void DirectorOnKeyInputFocusGained() + private void DirectorOnFocusGained() { - OnKeyInputFocusGained(); + OnFocusGained(); } - private void DirectorOnKeyInputFocusLost() + private void DirectorOnFocusLost() { - OnKeyInputFocusLost(); + OnFocusLost(); } - private global::System.IntPtr DirectorGetNextKeyboardFocusableActor(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled) + private global::System.IntPtr DirectorGetNextFocusableActor(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled) { - return Actor.getCPtr(GetNextKeyboardFocusableActor(new Actor(currentFocusedActor, false), (View.KeyboardFocus.Direction)direction, loopEnabled)).Handle; + return View.getCPtr(GetNextFocusableActor(new View(currentFocusedActor, false), (View.Focus.Direction)direction, loopEnabled)).Handle; } - private void DirectorOnKeyboardFocusChangeCommitted(global::System.IntPtr commitedFocusableActor) + private void DirectorOnFocusChangeCommitted(global::System.IntPtr commitedFocusableActor) { - OnKeyboardFocusChangeCommitted(new Actor(commitedFocusableActor, false)); + OnFocusChangeCommitted(new View(commitedFocusableActor, false)); } - private bool DirectorOnKeyboardEnter() + private bool DirectorOnFocusEnter() { - return OnKeyboardEnter(); + return OnFocusEnter(); } private void DirectorOnPinch(global::System.IntPtr pinch) @@ -576,15 +576,6 @@ namespace Dali private DelegateViewWrapperImpl_39 Delegate39; private DelegateViewWrapperImpl_40 Delegate40; - public enum CustomViewBehaviour - { - VIEW_BEHAVIOUR_DEFAULT = 0, - DISABLE_SIZE_NEGOTIATION = 1 << 0, - REQUIRES_KEYBOARD_NAVIGATION_SUPPORT = 1 << 5, - DISABLE_STYLE_CHANGE_SIGNALS = 1 << 6, - LAST_VIEW_BEHAVIOUR_FLAG - } - public static readonly int VIEW_BEHAVIOUR_FLAG_COUNT = NDalicManualPINVOKE.ViewWrapperImpl_CONTROL_BEHAVIOUR_FLAG_COUNT_get(); } }