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
Separate C# classes into Internal and Public
[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
f4a6b26
..
bf473d5
100644
(file)
--- a/
plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs
+++ b/
plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs
@@
-17,7
+17,7
@@
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);
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
public delegate void OnStageConnectionDelegate(int depth);
@@
-49,11
+49,11
@@
namespace Dali
public delegate bool OnAccessibilityTouchDelegate(Touch touch);
public delegate bool OnAccessibilityValueChangeDelegate(bool isIncrease);
public delegate bool OnAccessibilityZoomDelegate();
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 View GetNext
KeyboardFocusableActorDelegate(View currentFocusedActor, View.Keyboard
Focus.Direction direction, bool loopEnabled);
- public delegate void On
Keyboard
FocusChangeCommittedDelegate(View commitedFocusableActor);
- public delegate bool On
Keyboard
EnterDelegate();
+ public delegate void OnFocusGainedDelegate();
+ public delegate void OnFocusLostDelegate();
+ public delegate View GetNext
FocusableActorDelegate(View currentFocusedActor, View.
Focus.Direction direction, bool loopEnabled);
+ public delegate void OnFocusChangeCommittedDelegate(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();
@@
-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);
@@
-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 View.getCPtr(GetNext
KeyboardFocusableActor(new View(currentFocusedActor, false), (View.Keyboard
Focus.Direction)direction, loopEnabled)).Handle;
+ return View.getCPtr(GetNext
FocusableActor(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
Keyboard
FocusChangeCommitted(new View(commitedFocusableActor, false));
+ OnFocusChangeCommitted(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();
}
}