X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fdali-swig%2FSWIG%2Fevents%2Fcontrol-event.i;h=8e1334911f5e9e51961f3d4280245a11519d02cc;hb=b4c97a599d6c3c369584d96cc1cfcfa575107e78;hp=bcb12ca48043c8168ee4ea8dbf8a4fa0bfcf3872;hpb=baeb5ad3a0b2b1535c48dfb25f3d7ace66cde857;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/plugins/dali-swig/SWIG/events/control-event.i b/plugins/dali-swig/SWIG/events/control-event.i old mode 100644 new mode 100755 index bcb12ca..8e13349 --- a/plugins/dali-swig/SWIG/events/control-event.i +++ b/plugins/dali-swig/SWIG/events/control-event.i @@ -27,7 +27,6 @@ %define CONTROL_EVENTHANDLER_TYPEMAP_HELPER(NameSpace, ClassName) %typemap(cscode) NameSpace::ClassName %{ - /** * @brief Event arguments that passed via KeyInputFocusGained signal * @@ -79,16 +78,16 @@ } /** - * @brief Event arguments that passed via KeyEvent signal + * @brief Event arguments that passed via Key signal * */ public class KeyEventArgs : EventArgs { private View _view; - private KeyEvent _keyEvent; + private Key _key; /** - * @brief View - is the view that recieves the keyevent. + * @brief View - is the view that recieves the key. * */ public View View @@ -104,18 +103,18 @@ } /** - * @brief KeyEvent - is the keyevent sent to the View. + * @brief Key - is the key sent to the View. * */ - public KeyEvent KeyEvent + public Key Key { get { - return _keyEvent; + return _key; } set { - _keyEvent = value; + _key = value; } } } @@ -153,7 +152,7 @@ public class TouchEventArgs : EventArgs { private View _view; - private TouchData _touchData; + private Touch _touch; /** * @brief View - is the view that is being touched @@ -172,18 +171,18 @@ } /** - * @brief TouchData - contains the information of touch points + * @brief Touch - contains the information of touch points * */ - public TouchData TouchData + public Touch Touch { get { - return _touchData; + return _touch; } set { - _touchData = value; + _touch = value; } } } @@ -194,8 +193,8 @@ */ public class HoverEventArgs : EventArgs { - private View _view; - private HoverEvent _hoverEvent; + private View _view; + private Hover _hover; /** * @brief View - is the view that is being hovered @@ -214,19 +213,19 @@ } /** - * @brief HoverEvent - contains touch points that represent the points + * @brief Hover - contains touch points that represent the points * that are currently being hovered or the points where a hover has stopped * */ - public HoverEvent HoverEvent + public Hover Hover { get { - return _hoverEvent; + return _hover; } set { - _hoverEvent = value; + _hover = value; } } } @@ -237,8 +236,8 @@ */ public class WheelEventArgs : EventArgs { - private View _view; - private WheelEvent _wheelEvent; + private View _view; + private Wheel _wheel; /** * @brief View - is the view that is being wheeled @@ -257,18 +256,18 @@ } /** - * @brief WheelEvent - store a wheel rolling type : MOUSE_WHEEL or CUSTOM_WHEEL + * @brief Wheel - store a wheel rolling type : MOUSE_WHEEL or CUSTOM_WHEEL * */ - public WheelEvent WheelEvent + public Wheel Wheel { get { - return _wheelEvent; + return _wheel; } set { - _wheelEvent = value; + _wheel = value; } } } @@ -334,8 +333,8 @@ private KeyInputFocusLostCallbackDelegate _KeyInputFocusLostCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate bool KeyCallbackDelegate(IntPtr control, IntPtr keyEvent); - private DaliEventHandlerWithReturnType _KeyEventHandler; + private delegate bool KeyCallbackDelegate(IntPtr control, IntPtr key); + private DaliEventHandlerWithReturnType _KeyHandler; private KeyCallbackDelegate _KeyCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] @@ -344,19 +343,19 @@ private OnRelayoutEventCallbackDelegate _viewOnRelayoutEventCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate bool TouchCallbackDelegate(IntPtr view, IntPtr touchData); - private DaliEventHandlerWithReturnType _viewTouchDataEventHandler; - private TouchCallbackDelegate _viewTouchDataCallbackDelegate; + private delegate bool TouchCallbackDelegate(IntPtr view, IntPtr touch); + private DaliEventHandlerWithReturnType _viewTouchHandler; + private TouchCallbackDelegate _viewTouchCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate bool HoverEventCallbackDelegate(IntPtr view, IntPtr hoverEvent); - private DaliEventHandlerWithReturnType _viewHoverEventHandler; - private HoverEventCallbackDelegate _viewHoverEventCallbackDelegate; + private delegate bool HoverCallbackDelegate(IntPtr view, IntPtr hover); + private DaliEventHandlerWithReturnType _viewHoverHandler; + private HoverCallbackDelegate _viewHoverCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] - private delegate bool WheelEventCallbackDelegate(IntPtr view, IntPtr wheelEvent); - private DaliEventHandlerWithReturnType _viewWheelEventHandler; - private WheelEventCallbackDelegate _viewWheelEventCallbackDelegate; + private delegate bool WheelCallbackDelegate(IntPtr view, IntPtr wheel); + private DaliEventHandlerWithReturnType _viewWheelHandler; + private WheelCallbackDelegate _viewWheelCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] private delegate void OnStageEventCallbackDelegate(IntPtr control); @@ -383,7 +382,7 @@ if (_KeyInputFocusGainedEventHandler == null) { _KeyInputFocusGainedEventHandler += value; - Console.WriteLine("View Keyevent EVENT Locked...."); + Console.WriteLine("View Key EVENT Locked...."); _KeyInputFocusGainedCallbackDelegate = new KeyInputFocusGainedCallbackDelegate(OnKeyInputFocusGained); this.KeyInputFocusGainedSignal().Connect(_KeyInputFocusGainedCallbackDelegate); } @@ -407,7 +406,7 @@ private void OnKeyInputFocusGained(IntPtr view) { KeyInputFocusGainedEventArgs e = new KeyInputFocusGainedEventArgs(); - Console.WriteLine("View Keyevent ...."); + Console.WriteLine("View Key ...."); // Populate all members of "e" (KeyInputFocusGainedEventArgs) with real data e.View = Dali.View.GetViewFromPtr(view); @@ -421,7 +420,7 @@ /** * @brief Event for KeyInputFocusLost signal which can be used to subscribe/unsubscribe the event handler - * (in the type of KeyInputFocusLostEventHandler-DaliEventHandler) + * (in the type of KeyInputFocusLostEventHandler-DaliEventHandler) * provided by the user. KeyInputFocusLost signal is emitted when the control loses Key Input Focus. */ public event DaliEventHandler KeyInputFocusLost @@ -471,7 +470,7 @@ /** * @brief Event for KeyPressed signal which can be used to subscribe/unsubscribe the event handler - * (in the type of KeyEventEventHandler-DaliEventHandlerWithReturnType) + * (in the type of KeyHandler-DaliEventHandlerWithReturnType) * provided by the user. KeyPressed signal is emitted when key event is received. */ public event DaliEventHandlerWithReturnType KeyPressed @@ -481,11 +480,11 @@ lock(this) { // Restricted to only one listener - if (_KeyEventHandler == null) + if (_KeyHandler == null) { - _KeyEventHandler += value; + _KeyHandler += value; - _KeyCallbackDelegate = new KeyCallbackDelegate(OnKeyEvent); + _KeyCallbackDelegate = new KeyCallbackDelegate(OnKey); this.KeyEventSignal().Connect(_KeyCallbackDelegate); } } @@ -495,28 +494,28 @@ { lock(this) { - if (_KeyEventHandler != null) + if (_KeyHandler != null) { this.KeyEventSignal().Disconnect(_KeyCallbackDelegate); } - _KeyEventHandler -= value; + _KeyHandler -= value; } } } - private bool OnKeyEvent(IntPtr view, IntPtr keyEvent) + private bool OnKey(IntPtr view, IntPtr key) { KeyEventArgs e = new KeyEventArgs(); // Populate all members of "e" (KeyEventArgs) with real data e.View = Dali.View.GetViewFromPtr(view); - e.KeyEvent = Dali.KeyEvent.GetKeyEventFromPtr(keyEvent); + e.Key = Dali.Key.GetKeyFromPtr(key); - if (_KeyEventHandler != null) + if (_KeyHandler != null) { //here we send all data to user event handlers - return _KeyEventHandler(this, e); + return _KeyHandler(this, e); } return false; @@ -575,7 +574,7 @@ /** * @brief Event for Touched signal which can be used to subscribe/unsubscribe the event handler - * (in the type of TouchEventHandler-DaliEventHandlerWithReturnType) + * (in the type of TouchHandler-DaliEventHandlerWithReturnType) * provided by the user. Touched signal is emitted when touch input is received. */ public event DaliEventHandlerWithReturnType Touched @@ -585,12 +584,12 @@ lock(this) { // Restricted to only one listener - if (_viewTouchDataEventHandler == null) + if (_viewTouchHandler == null) { - _viewTouchDataEventHandler += value; + _viewTouchHandler += value; Console.WriteLine("View Touch EVENT LOCKED...."); - _viewTouchDataCallbackDelegate = new TouchCallbackDelegate(OnTouch); - this.TouchSignal().Connect(_viewTouchDataCallbackDelegate); + _viewTouchCallbackDelegate = new TouchCallbackDelegate(OnTouch); + this.TouchSignal().Connect(_viewTouchCallbackDelegate); } } } @@ -599,29 +598,29 @@ { lock(this) { - if (_viewTouchDataEventHandler != null) + if (_viewTouchHandler != null) { - this.TouchSignal().Disconnect(_viewTouchDataCallbackDelegate); + this.TouchSignal().Disconnect(_viewTouchCallbackDelegate); } - _viewTouchDataEventHandler -= value; + _viewTouchHandler -= value; } } } // Callback for View TouchSignal - private bool OnTouch(IntPtr view, IntPtr touchData) + private bool OnTouch(IntPtr view, IntPtr touch) { TouchEventArgs e = new TouchEventArgs(); Console.WriteLine("View Touch EVENT...."); // Populate all members of "e" (TouchEventArgs) with real data e.View = View.GetViewFromPtr(view); - e.TouchData = Dali.TouchData.GetTouchDataFromPtr(touchData); + e.Touch = Dali.Touch.GetTouchFromPtr(touch); - if (_viewTouchDataEventHandler != null) + if (_viewTouchHandler != null) { //here we send all data to user event handlers - return _viewTouchDataEventHandler(this, e); + return _viewTouchHandler(this, e); } return false; @@ -629,7 +628,7 @@ /** * @brief Event for Hovered signal which can be used to subscribe/unsubscribe the event handler - * (in the type of HoverEventHandler-DaliEventHandlerWithReturnType) + * (in the type of HoverHandler-DaliEventHandlerWithReturnType) * provided by the user. Hovered signal is emitted when hover input is received. */ public event DaliEventHandlerWithReturnType Hovered @@ -639,12 +638,12 @@ lock(this) { // Restricted to only one listener - if (_viewHoverEventHandler == null) + if (_viewHoverHandler == null) { - _viewHoverEventHandler += value; + _viewHoverHandler += value; - _viewHoverEventCallbackDelegate = new HoverEventCallbackDelegate(OnHoverEvent); - this.HoveredSignal().Connect(_viewHoverEventCallbackDelegate); + _viewHoverCallbackDelegate = new HoverCallbackDelegate(OnHover); + this.HoveredSignal().Connect(_viewHoverCallbackDelegate); } } } @@ -653,29 +652,29 @@ { lock(this) { - if (_viewHoverEventHandler != null) + if (_viewHoverHandler != null) { - this.HoveredSignal().Disconnect(_viewHoverEventCallbackDelegate); + this.HoveredSignal().Disconnect(_viewHoverCallbackDelegate); } - _viewHoverEventHandler -= value; + _viewHoverHandler -= value; } } } // Callback for View Hover signal - private bool OnHoverEvent(IntPtr view, IntPtr hoverEvent) + private bool OnHover(IntPtr view, IntPtr hover) { HoverEventArgs e = new HoverEventArgs(); // Populate all members of "e" (HoverEventArgs) with real data e.View = View.GetViewFromPtr(view); - e.HoverEvent = Dali.HoverEvent.GetHoverEventFromPtr(hoverEvent); + e.Hover = Dali.Hover.GetHoverFromPtr(hover); - if (_viewHoverEventHandler != null) + if (_viewHoverHandler != null) { //here we send all data to user event handlers - return _viewHoverEventHandler(this, e); + return _viewHoverHandler(this, e); } return false; @@ -683,7 +682,7 @@ /** * @brief Event for WheelMoved signal which can be used to subscribe/unsubscribe the event handler - * (in the type of WheelEventHandler-DaliEventHandlerWithReturnType) + * (in the type of WheelHandler-DaliEventHandlerWithReturnType) * provided by the user. WheelMoved signal is emitted when wheel event is received. */ public event DaliEventHandlerWithReturnType WheelMoved @@ -693,12 +692,12 @@ lock(this) { // Restricted to only one listener - if (_viewWheelEventHandler == null) + if (_viewWheelHandler == null) { - _viewWheelEventHandler += value; + _viewWheelHandler += value; Console.WriteLine("View Wheel EVENT LOCKED...."); - _viewWheelEventCallbackDelegate = new WheelEventCallbackDelegate(OnWheelEvent); - this.WheelEventSignal().Connect(_viewWheelEventCallbackDelegate); + _viewWheelCallbackDelegate = new WheelCallbackDelegate(OnWheel); + this.WheelEventSignal().Connect(_viewWheelCallbackDelegate); } } } @@ -707,29 +706,29 @@ { lock(this) { - if (_viewWheelEventHandler != null) + if (_viewWheelHandler != null) { - this.WheelEventSignal().Disconnect(_viewWheelEventCallbackDelegate); + this.WheelEventSignal().Disconnect(_viewWheelCallbackDelegate); } - _viewWheelEventHandler -= value; + _viewWheelHandler -= value; } } } // Callback for View Wheel signal - private bool OnWheelEvent(IntPtr view, IntPtr wheelEvent) + private bool OnWheel(IntPtr view, IntPtr wheel) { WheelEventArgs e = new WheelEventArgs(); Console.WriteLine("View Wheel EVENT ...."); // Populate all members of "e" (WheelEventArgs) with real data e.View = View.GetViewFromPtr(view); - e.WheelEvent = Dali.WheelEvent.GetWheelEventFromPtr(wheelEvent); + e.Wheel = Dali.Wheel.GetWheelFromPtr(wheel); - if (_viewWheelEventHandler != null) + if (_viewWheelHandler != null) { //here we send all data to user event handlers - return _viewWheelEventHandler(this, e); + return _viewWheelHandler(this, e); } return false; @@ -779,6 +778,8 @@ // Populate all members of "e" (OnStageEventArgs) with real data e.View = View.GetViewFromPtr(data); + //Console.WriteLine("############# OnStage()! e.View.Name=" + e.View.Name); + if (_viewOnStageEventHandler != null) { //here we send all data to user event handlers @@ -843,196 +844,38 @@ return ret; } -/* Properties earlier added by Ruby Script */ - - public Dali.CSharp.Size CellIndex - { - get - { - Vector2 temp = new Vector2(0.0f,0.0f); - GetProperty( TableView.ChildProperty.CELL_INDEX).Get( temp ); - Dali.CSharp.Size ret = new Dali.CSharp.Size(temp.x, temp.y); - return ret; - } - set - { - SetProperty( TableView.ChildProperty.CELL_INDEX, new Dali.Property.Value( value ) ); - } - } - public float RowSpan - { - get - { - float temp = 0.0f; - GetProperty( TableView.ChildProperty.ROW_SPAN).Get( ref temp ); - return temp; - } - set - { - SetProperty( TableView.ChildProperty.ROW_SPAN, new Dali.Property.Value( value ) ); - } - } - public float ColumnSpan - { - get - { - float temp = 0.0f; - GetProperty( TableView.ChildProperty.COLUMN_SPAN).Get( ref temp ); - return temp; - } - set - { - SetProperty( TableView.ChildProperty.COLUMN_SPAN, new Dali.Property.Value( value ) ); - } - } - public string CellHorizontalAlignment - { - get - { - string temp; - GetProperty( TableView.ChildProperty.CELL_HORIZONTAL_ALIGNMENT).Get( out temp ); - return temp; - } - set - { - SetProperty( TableView.ChildProperty.CELL_HORIZONTAL_ALIGNMENT, new Dali.Property.Value( value ) ); - } - } - public string CellVerticalAlignment - { - get - { - string temp; - GetProperty( TableView.ChildProperty.CELL_VERTICAL_ALIGNMENT).Get( out temp ); - return temp; - } - set - { - SetProperty( TableView.ChildProperty.CELL_VERTICAL_ALIGNMENT, new Dali.Property.Value( value ) ); - } - } - - public float Flex - { - get - { - float temp = 0.0f; - GetProperty( FlexContainer.ChildProperty.FLEX).Get( ref temp ); - return temp; - } - set - { - SetProperty( FlexContainer.ChildProperty.FLEX, new Dali.Property.Value( value ) ); - } - } - public int AlignSelf - { - get - { - int temp = 0; - GetProperty( FlexContainer.ChildProperty.ALIGN_SELF).Get( ref temp ); - return temp; - } - set + public Dali.Property.Map Tooltip { - SetProperty( FlexContainer.ChildProperty.ALIGN_SELF, new Dali.Property.Value( value ) ); - } - } - public Vector4 FlexMargin - { - get - { - Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f); - GetProperty( FlexContainer.ChildProperty.FLEX_MARGIN).Get( temp ); - return temp; - } - set - { - SetProperty( FlexContainer.ChildProperty.FLEX_MARGIN, new Dali.Property.Value( value ) ); + get + { + Dali.Property.Map temp = new Dali.Property.Map(); + GetProperty( View.Property.TOOLTIP).Get( temp ); + return temp; + } + set + { + SetProperty( View.Property.TOOLTIP, new Dali.Property.Value( value ) ); + } } - } - public string StyleName - { - get - { - string temp; - GetProperty( View.Property.STYLE_NAME).Get( out temp ); - return temp; - } - set - { - SetProperty( View.Property.STYLE_NAME, new Dali.Property.Value( value ) ); - } - } - public Dali.CSharp.Color BackgroundColor - { - get - { - Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f); - GetProperty( View.Property.BACKGROUND_COLOR).Get( temp ); - Dali.CSharp.Color ret = new Dali.CSharp.Color(temp.r, temp.g, temp.b, temp.a); - return ret; - } - set - { - SetProperty( View.Property.BACKGROUND_COLOR, new Dali.Property.Value( value ) ); - } - } - public Dali.Property.Map BackgroundImage - { - get + public string TooltipText { - Dali.Property.Map temp = new Dali.Property.Map(); - GetProperty( View.Property.BACKGROUND_IMAGE).Get( temp ); - return temp; - } - set - { - SetProperty( View.Property.BACKGROUND_IMAGE, new Dali.Property.Value( value ) ); - } - } - public bool KeyInputFocus - { - get - { - bool temp = false; - GetProperty( View.Property.KEY_INPUT_FOCUS).Get( ref temp ); - return temp; - } - set - { - SetProperty( View.Property.KEY_INPUT_FOCUS, new Dali.Property.Value( value ) ); - } - } - public Dali.Property.Map Background - { - get - { - Dali.Property.Map temp = new Dali.Property.Map(); - GetProperty( View.Property.BACKGROUND).Get( temp ); - return temp; - } - set - { - SetProperty( View.Property.BACKGROUND, new Dali.Property.Value( value ) ); + set + { + SetProperty( View.Property.TOOLTIP, new Dali.Property.Value( value ) ); + } } - } - -/* Properties ends */ - - %} - - %enddef + %} +%enddef %define DALI_CONTROL_EVENTHANDLER_PARAM( NameSpace, ClassName) CONTROL_EVENTHANDLER_TYPEMAP_EVENTARG( NameSpace, ClassName); CONTROL_EVENTHANDLER_TYPEMAP_HELPER( NameSpace, ClassName); - %enddef +%enddef - namespace Dali +namespace Dali { DALI_CONTROL_EVENTHANDLER_PARAM( Dali::Toolkit, Control); }