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
Note that some Text propeties in devel api can't be changed
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-sharp
/
sharp
/
internal
/
ViewWrapperImpl.cs
diff --git
a/plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs
b/plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs
index
145ab54
..
bf473d5
100644
(file)
--- a/
plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs
+++ b/
plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs
@@
-17,13
+17,13
@@
namespace Dali
{
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();
{
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);
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 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 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 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 On
KeyInput
FocusGainedDelegate();
- public delegate void On
KeyInput
FocusLostDelegate();
- public delegate
Actor GetNextKeyboardFocusableActorDelegate(Actor currentFocusedActor, View.Keyboard
Focus.Direction direction, bool loopEnabled);
- public delegate void On
KeyboardFocusChangeCommittedDelegate(Actor
commitedFocusableActor);
- public delegate bool On
Keyboard
EnterDelegate();
+ public delegate void OnFocusGainedDelegate();
+ public delegate void OnFocusLostDelegate();
+ public delegate
View GetNextFocusableActorDelegate(View currentFocusedActor, View.
Focus.Direction direction, bool loopEnabled);
+ public delegate void On
FocusChangeCommittedDelegate(View
commitedFocusableActor);
+ public delegate bool On
Focus
EnterDelegate();
public delegate void OnPinchDelegate(PinchGesture pinch);
public delegate void OnPanDelegate(PanGesture pan);
public delegate void OnTapDelegate(TapGesture tap);
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 OnAccessibilityTouchDelegate OnAccessibilityTouch;
public OnAccessibilityValueChangeDelegate OnAccessibilityValueChange;
public OnAccessibilityZoomDelegate OnAccessibilityZoom;
- public On
KeyInputFocusGainedDelegate OnKeyInput
FocusGained;
- public On
KeyInputFocusLostDelegate OnKeyInput
FocusLost;
- public GetNext
KeyboardFocusableActorDelegate GetNextKeyboard
FocusableActor;
- public On
KeyboardFocusChangeCommittedDelegate OnKeyboard
FocusChangeCommitted;
- public On
KeyboardEnterDelegate OnKeyboard
Enter;
+ public On
FocusGainedDelegate On
FocusGained;
+ public On
FocusLostDelegate On
FocusLost;
+ public GetNext
FocusableActorDelegate GetNext
FocusableActor;
+ public On
FocusChangeCommittedDelegate On
FocusChangeCommitted;
+ public On
FocusEnterDelegate OnFocus
Enter;
public OnPinchDelegate OnPinch;
public OnPanDelegate OnPan;
public OnTapDelegate OnTap;
public OnPinchDelegate OnPinch;
public OnPanDelegate OnPan;
public OnTapDelegate OnTap;
@@
-115,7
+115,7
@@
namespace Dali
public override void Dispose()
{
public override void Dispose()
{
- if (!
Stage
.IsInstalled())
+ if (!
Window
.IsInstalled())
{
DisposeQueue.Instance.Add(this);
return;
{
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();
{
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
DirectorConnect();
@@
-170,9
+170,9
@@
namespace Dali
return ret;
}
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;
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
@@
-236,7
+236,7
@@
namespace Dali
return ret;
}
return ret;
}
- public void Emit
KeyInput
FocusSignal(bool focusGained)
+ public void EmitFocusSignal(bool focusGained)
{
NDalicManualPINVOKE.ViewWrapperImpl_EmitKeyInputFocusSignal(swigCPtr, focusGained);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
{
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);
Delegate27 = new DelegateViewWrapperImpl_27(DirectorOnAccessibilityTouch);
Delegate28 = new DelegateViewWrapperImpl_28(DirectorOnAccessibilityValueChange);
Delegate29 = new DelegateViewWrapperImpl_29(DirectorOnAccessibilityZoom);
- Delegate30 = new DelegateViewWrapperImpl_30(DirectorOn
KeyInput
FocusGained);
- Delegate31 = new DelegateViewWrapperImpl_31(DirectorOn
KeyInput
FocusLost);
- Delegate32 = new DelegateViewWrapperImpl_32(DirectorGetNext
Keyboard
FocusableActor);
- Delegate33 = new DelegateViewWrapperImpl_33(DirectorOn
Keyboard
FocusChangeCommitted);
- Delegate34 = new DelegateViewWrapperImpl_34(DirectorOn
Keyboard
Enter);
+ Delegate30 = new DelegateViewWrapperImpl_30(DirectorOnFocusGained);
+ Delegate31 = new DelegateViewWrapperImpl_31(DirectorOnFocusLost);
+ Delegate32 = new DelegateViewWrapperImpl_32(DirectorGetNextFocusableActor);
+ Delegate33 = new DelegateViewWrapperImpl_33(DirectorOnFocusChangeCommitted);
+ Delegate34 = new DelegateViewWrapperImpl_34(DirectorOn
Focus
Enter);
Delegate35 = new DelegateViewWrapperImpl_35(DirectorOnPinch);
Delegate36 = new DelegateViewWrapperImpl_36(DirectorOnPan);
Delegate37 = new DelegateViewWrapperImpl_37(DirectorOnTap);
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)
{
private void DirectorOnChildAdd(global::System.IntPtr child)
{
- OnChildAdd(new
Actor
(child, false));
+ OnChildAdd(new
View
(child, false));
}
private void DirectorOnChildRemove(global::System.IntPtr child)
{
}
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)
}
private void DirectorOnPropertySet(int index, global::System.IntPtr propertyValue)
@@
-367,7
+367,7
@@
namespace Dali
private float DirectorCalculateChildSize(global::System.IntPtr child, int dimension)
{
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)
}
private float DirectorGetHeightForWidth(float width)
@@
-406,12
+406,12
@@
namespace Dali
private void DirectorOnControlChildAdd(global::System.IntPtr child)
{
private void DirectorOnControlChildAdd(global::System.IntPtr child)
{
- OnControlChildAdd(new
Actor
(child, false));
+ OnControlChildAdd(new
View
(child, false));
}
private void DirectorOnControlChildRemove(global::System.IntPtr child)
{
}
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)
}
private void DirectorOnStyleChange(global::System.IntPtr styleManager, int change)
@@
-447,29
+447,29
@@
namespace Dali
return OnAccessibilityZoom();
}
return OnAccessibilityZoom();
}
- private void DirectorOn
KeyInput
FocusGained()
+ private void DirectorOnFocusGained()
{
{
- On
KeyInput
FocusGained();
+ OnFocusGained();
}
}
- private void DirectorOn
KeyInput
FocusLost()
+ private void DirectorOnFocusLost()
{
{
- On
KeyInput
FocusLost();
+ OnFocusLost();
}
}
- private global::System.IntPtr DirectorGetNext
Keyboard
FocusableActor(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.Keyboard
Focus.Direction)direction, loopEnabled)).Handle;
+ return
View.getCPtr(GetNextFocusableActor(new View(currentFocusedActor, false), (View.
Focus.Direction)direction, loopEnabled)).Handle;
}
}
- private void DirectorOn
Keyboard
FocusChangeCommitted(global::System.IntPtr commitedFocusableActor)
+ private void DirectorOnFocusChangeCommitted(global::System.IntPtr commitedFocusableActor)
{
{
- On
KeyboardFocusChangeCommitted(new Actor
(commitedFocusableActor, false));
+ On
FocusChangeCommitted(new View
(commitedFocusableActor, false));
}
}
- private bool DirectorOn
Keyboard
Enter()
+ private bool DirectorOn
Focus
Enter()
{
{
- return On
Keyboard
Enter();
+ return On
Focus
Enter();
}
private void DirectorOnPinch(global::System.IntPtr pinch)
}
private void DirectorOnPinch(global::System.IntPtr pinch)
@@
-576,15
+576,6
@@
namespace Dali
private DelegateViewWrapperImpl_39 Delegate39;
private DelegateViewWrapperImpl_40 Delegate40;
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();
}
}
public static readonly int VIEW_BEHAVIOUR_FLAG_COUNT = NDalicManualPINVOKE.ViewWrapperImpl_CONTROL_BEHAVIOUR_FLAG_COUNT_get();
}
}