X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fdali-swig%2FSWIG%2Fevents%2Fcontrol-event.i;h=36704ca953d5b13d2828d296634634fae2db8616;hb=refs%2Fchanges%2F57%2F112157%2F4;hp=bcb12ca48043c8168ee4ea8dbf8a4fa0bfcf3872;hpb=1c79fd0c77d266314b74e32ab8a0070fb5178380;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..36704ca --- 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 * @@ -192,10 +191,10 @@ * @brief Event arguments that passed via Hover signal * */ - public class HoverEventArgs : EventArgs + public class HoverArgs : EventArgs { private View _view; - private HoverEvent _hoverEvent; + 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; } } } @@ -349,9 +348,9 @@ private TouchCallbackDelegate _viewTouchDataCallbackDelegate; [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); @@ -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 KeyEventEventHandler-DaliEventHandlerWithReturnType) * provided by the user. KeyPressed signal is emitted when key event is received. */ public event DaliEventHandlerWithReturnType KeyPressed @@ -629,22 +628,22 @@ /** * @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 + public event DaliEventHandlerWithReturnType Hovered { add { 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(); + HoverArgs e = new HoverArgs(); - // Populate all members of "e" (HoverEventArgs) with real data + // Populate all members of "e" (HoverArgs) 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; @@ -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 - { - SetProperty( FlexContainer.ChildProperty.ALIGN_SELF, new Dali.Property.Value( value ) ); - } - } - public Vector4 FlexMargin - { - get + public Dali.Property.Map Tooltip { - 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 - { - 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 + public string TooltipText { - 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); }