projects
/
platform
/
core
/
csapi
/
tizenfx.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update widget and widget application
[platform/core/csapi/tizenfx.git]
/
src
/
Tizen.NUI
/
src
/
public
/
Widget.cs
diff --git
a/src/Tizen.NUI/src/public/Widget.cs
b/src/Tizen.NUI/src/public/Widget.cs
index
1b4b693
..
930a46f
100755
(executable)
--- a/
src/Tizen.NUI/src/public/Widget.cs
+++ b/
src/Tizen.NUI/src/public/Widget.cs
@@
-99,10
+99,10
@@
namespace Tizen.NUI
public class CreateEventArgs : EventArgs
{
/// <summary>
public class CreateEventArgs : EventArgs
{
/// <summary>
- /// widget
data
.
+ /// widget
id
.
/// </summary>
/// <since_tizen> 4 </since_tizen>
/// </summary>
/// <since_tizen> 4 </since_tizen>
- public
WidgetData WidgetData
+ public
string ID
{
get;
set;
{
get;
set;
@@
-119,10
+119,10
@@
namespace Tizen.NUI
}
/// <summary>
}
/// <summary>
- /// window
size
.
+ /// window.
/// </summary>
/// <since_tizen> 4 </since_tizen>
/// </summary>
/// <since_tizen> 4 </since_tizen>
- public
Size2D WindowSize
+ public
Window Window
{
get;
set;
{
get;
set;
@@
-130,7
+130,7
@@
namespace Tizen.NUI
}
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
}
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
- private delegate void CreateCallbackType(
IntPtr widgetData, IntPtr bundle, IntPtr windowSize
);
+ private delegate void CreateCallbackType(
string id, IntPtr bundle, IntPtr window
);
private CreateCallbackType _createCallback;
private EventHandler<CreateEventArgs> _createEventHandler;
private CreateCallbackType _createCallback;
private EventHandler<CreateEventArgs> _createEventHandler;
@@
-162,30
+162,27
@@
namespace Tizen.NUI
}
}
}
}
- private void OnCreate(
IntPtr widgetData, IntPtr bundle, IntPtr windowSize
)
+ private void OnCreate(
string id, IntPtr bundle, IntPtr window
)
{
CreateEventArgs e = new CreateEventArgs();
{
CreateEventArgs e = new CreateEventArgs();
- if (widgetData != null)
- {
- e.WidgetData = WidgetData.GetWidgetDataFromPtr(widgetData);
- }
+
+ e.ID = id;
+
if (bundle != null)
{
e.Bundle = new SWIGTYPE_p_bundle(bundle, false);
}
if (bundle != null)
{
e.Bundle = new SWIGTYPE_p_bundle(bundle, false);
}
- if (window
Size
!= null)
+ if (window != null)
{
{
- var val = new Uint16Pair(windowSize, false);
- e.WindowSize = val;
- val.Dispose();
+ e.Window = new Window(window, false);
}
_createEventHandler?.Invoke(this, e);
}
}
_createEventHandler?.Invoke(this, e);
}
- internal Widget
Instance
CreateSignalType CreateSignal()
+ internal WidgetCreateSignalType CreateSignal()
{
{
- Widget
InstanceCreateSignalType ret = new WidgetInstance
CreateSignalType(NDalicManualPINVOKE.Widget_CreateSignal(swigCPtr), false);
+ Widget
CreateSignalType ret = new Widget
CreateSignalType(NDalicManualPINVOKE.Widget_CreateSignal(swigCPtr), false);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
@@
-196,10
+193,10
@@
namespace Tizen.NUI
public class TerminateEventArgs : EventArgs
{
/// <summary>
public class TerminateEventArgs : EventArgs
{
/// <summary>
- /// widget
data
.
+ /// widget
id
.
/// </summary>
/// <since_tizen> 4 </since_tizen>
/// </summary>
/// <since_tizen> 4 </since_tizen>
- public
WidgetData WidgetData
+ public
string ID
{
get;
set;
{
get;
set;
@@
-227,7
+224,7
@@
namespace Tizen.NUI
}
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
}
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
- private delegate void TerminateCallbackType(
IntPtr widgetData
, IntPtr bundle, WidgetTerminateType widgetTerminateType);
+ private delegate void TerminateCallbackType(
string id
, IntPtr bundle, WidgetTerminateType widgetTerminateType);
private TerminateCallbackType _terminateCallback;
private EventHandler<TerminateEventArgs> _terminateEventHandler;
private TerminateCallbackType _terminateCallback;
private EventHandler<TerminateEventArgs> _terminateEventHandler;
@@
-259,13
+256,11
@@
namespace Tizen.NUI
}
}
}
}
- private void OnTerminate(
IntPtr widgetData
, IntPtr bundle, WidgetTerminateType widgetTerminateType)
+ private void OnTerminate(
string id
, IntPtr bundle, WidgetTerminateType widgetTerminateType)
{
TerminateEventArgs e = new TerminateEventArgs();
{
TerminateEventArgs e = new TerminateEventArgs();
- if (widgetData != null)
- {
- e.WidgetData = WidgetData.GetWidgetDataFromPtr(widgetData);
- }
+ e.ID = id;
+
if (bundle != null)
{
e.Bundle = new SWIGTYPE_p_bundle(bundle, false);
if (bundle != null)
{
e.Bundle = new SWIGTYPE_p_bundle(bundle, false);
@@
-275,9
+270,9
@@
namespace Tizen.NUI
_terminateEventHandler?.Invoke(this, e);
}
_terminateEventHandler?.Invoke(this, e);
}
- internal Widget
Instance
TerminateSignalType TerminateSignal()
+ internal WidgetTerminateSignalType TerminateSignal()
{
{
- Widget
InstanceTerminateSignalType ret = new WidgetInstance
TerminateSignalType(NDalicManualPINVOKE.Widget_TerminateSignal(swigCPtr), false);
+ Widget
TerminateSignalType ret = new Widget
TerminateSignalType(NDalicManualPINVOKE.Widget_TerminateSignal(swigCPtr), false);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
@@
-288,10
+283,10
@@
namespace Tizen.NUI
public class PauseEventArgs : EventArgs
{
/// <summary>
public class PauseEventArgs : EventArgs
{
/// <summary>
- /// widget
data
.
+ /// widget
id
.
/// </summary>
/// </summary>
-
/// <since_tizen> 4 </since_tizen>
- public
WidgetData WidgetData
+ /// <since_tizen> 4 </since_tizen>
+ public
string ID
{
get;
set;
{
get;
set;
@@
-299,7
+294,7
@@
namespace Tizen.NUI
}
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
}
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
- private delegate void PauseCallbackType(
IntPtr widgetData
);
+ private delegate void PauseCallbackType(
string id
);
private PauseCallbackType _pauseCallback;
private EventHandler<PauseEventArgs> _pauseEventHandler;
private PauseCallbackType _pauseCallback;
private EventHandler<PauseEventArgs> _pauseEventHandler;
@@
-331,20
+326,17
@@
namespace Tizen.NUI
}
}
}
}
- private void OnPause(
IntPtr widgetData
)
+ private void OnPause(
string id
)
{
PauseEventArgs e = new PauseEventArgs();
{
PauseEventArgs e = new PauseEventArgs();
- if (widgetData != null)
- {
- e.WidgetData = WidgetData.GetWidgetDataFromPtr(widgetData);
- }
+ e.ID = id;
_pauseEventHandler?.Invoke(this, e);
}
_pauseEventHandler?.Invoke(this, e);
}
- internal Widget
InstancePauseOrResum
eSignalType PauseSignal()
+ internal Widget
Paus
eSignalType PauseSignal()
{
{
- Widget
InstancePauseOrResumeSignalType ret = new WidgetInstancePauseOrResum
eSignalType(NDalicManualPINVOKE.Widget_PauseSignal(swigCPtr), false);
+ Widget
PauseSignalType ret = new WidgetPaus
eSignalType(NDalicManualPINVOKE.Widget_PauseSignal(swigCPtr), false);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
@@
-355,10
+347,10
@@
namespace Tizen.NUI
public class ResumeEventArgs : EventArgs
{
/// <summary>
public class ResumeEventArgs : EventArgs
{
/// <summary>
- /// widget
data
.
+ /// widget
id
.
/// </summary>
/// </summary>
-
/// <since_tizen> 4 </since_tizen>
- public
WidgetData WidgetData
+ /// <since_tizen> 4 </since_tizen>
+ public
string ID
{
get;
set;
{
get;
set;
@@
-366,7
+358,7
@@
namespace Tizen.NUI
}
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
}
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
- private delegate void ResumeCallbackType(
IntPtr widgetData
);
+ private delegate void ResumeCallbackType(
string id
);
private ResumeCallbackType _resumeCallback;
private EventHandler<ResumeEventArgs> _resumeEventHandler;
private ResumeCallbackType _resumeCallback;
private EventHandler<ResumeEventArgs> _resumeEventHandler;
@@
-398,20
+390,17
@@
namespace Tizen.NUI
}
}
}
}
- private void OnResume(
IntPtr widgetData
)
+ private void OnResume(
string id
)
{
ResumeEventArgs e = new ResumeEventArgs();
{
ResumeEventArgs e = new ResumeEventArgs();
- if (widgetData != null)
- {
- e.WidgetData = WidgetData.GetWidgetDataFromPtr(widgetData);
- }
+ e.ID = id;
_resumeEventHandler?.Invoke(this, e);
}
_resumeEventHandler?.Invoke(this, e);
}
- internal Widget
InstancePauseOr
ResumeSignalType ResumeSignal()
+ internal WidgetResumeSignalType ResumeSignal()
{
{
- Widget
InstancePauseOrResumeSignalType ret = new WidgetInstancePauseOr
ResumeSignalType(NDalicManualPINVOKE.Widget_ResumeSignal(swigCPtr), false);
+ Widget
ResumeSignalType ret = new Widget
ResumeSignalType(NDalicManualPINVOKE.Widget_ResumeSignal(swigCPtr), false);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
@@
-422,20
+411,20
@@
namespace Tizen.NUI
public class ResizeEventArgs : EventArgs
{
/// <summary>
public class ResizeEventArgs : EventArgs
{
/// <summary>
- /// widget
data
.
+ /// widget
id
.
/// </summary>
/// </summary>
-
/// <since_tizen> 4 </since_tizen>
- public
WidgetData WidgetData
+ /// <since_tizen> 4 </since_tizen>
+ public
string ID
{
get;
set;
}
/// <summary>
{
get;
set;
}
/// <summary>
- /// window
size
.
+ /// window.
/// </summary>
/// </summary>
-
/// <since_tizen> 4 </since_tizen>
- public
Size2D WindowSize
+ /// <since_tizen> 4 </since_tizen>
+ public
Window Window
{
get;
set;
{
get;
set;
@@
-443,7
+432,7
@@
namespace Tizen.NUI
}
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
}
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
- private delegate void ResizeCallbackType(
IntPtr widgetData, IntPtr windowSize
);
+ private delegate void ResizeCallbackType(
string id, IntPtr window
);
private ResizeCallbackType _resizeCallback;
private EventHandler<ResizeEventArgs> _resizeEventHandler;
private ResizeCallbackType _resizeCallback;
private EventHandler<ResizeEventArgs> _resizeEventHandler;
@@
-475,26
+464,21
@@
namespace Tizen.NUI
}
}
}
}
- private void OnResize(
IntPtr widgetData, IntPtr windowSize
)
+ private void OnResize(
string id, IntPtr window
)
{
ResizeEventArgs e = new ResizeEventArgs();
{
ResizeEventArgs e = new ResizeEventArgs();
- if (widgetData != null)
+ e.ID = id;
+ if (window != null)
{
{
- e.WidgetData = WidgetData.GetWidgetDataFromPtr(widgetData);
- }
- if (windowSize != null)
- {
- var val = new Uint16Pair(windowSize, false);
- e.WindowSize = val;
- val.Dispose();
+ e.Window = new Window(window, false);
}
_resizeEventHandler?.Invoke(this, e);
}
}
_resizeEventHandler?.Invoke(this, e);
}
- internal Widget
Instance
ResizeSignalType ResizeSignal()
+ internal WidgetResizeSignalType ResizeSignal()
{
{
- Widget
InstanceResizeSignalType ret = new WidgetInstance
ResizeSignalType(NDalicManualPINVOKE.Widget_ResizeSignal(swigCPtr), false);
+ Widget
ResizeSignalType ret = new Widget
ResizeSignalType(NDalicManualPINVOKE.Widget_ResizeSignal(swigCPtr), false);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
@@
-508,7
+492,7
@@
namespace Tizen.NUI
/// widget data.
/// </summary>
/// <since_tizen> 4 </since_tizen>
/// widget data.
/// </summary>
/// <since_tizen> 4 </since_tizen>
- public
WidgetData WidgetData
+ public
string ID
{
get;
set;
{
get;
set;
@@
-529,7
+513,7
@@
namespace Tizen.NUI
/// </summary>
/// <remark>
/// 0 -> no force
/// </summary>
/// <remark>
/// 0 -> no force
- /// 1 -> force but do someting
+ /// 1 -> force but do somet
h
ing
/// 2 -> force
/// </remark>
/// <since_tizen> 4 </since_tizen>
/// 2 -> force
/// </remark>
/// <since_tizen> 4 </since_tizen>
@@
-541,7
+525,7
@@
namespace Tizen.NUI
}
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
}
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
- private delegate void UpdateCallbackType(
IntPtr widgetData
, IntPtr bundle, int force);
+ private delegate void UpdateCallbackType(
string id
, IntPtr bundle, int force);
private UpdateCallbackType _updateCallback;
private EventHandler<UpdateEventArgs> _updateEventHandler;
private UpdateCallbackType _updateCallback;
private EventHandler<UpdateEventArgs> _updateEventHandler;
@@
-573,13
+557,10
@@
namespace Tizen.NUI
}
}
}
}
- private void OnUpdate(
IntPtr widgetData
, IntPtr bundle, int force)
+ private void OnUpdate(
string id
, IntPtr bundle, int force)
{
UpdateEventArgs e = new UpdateEventArgs();
{
UpdateEventArgs e = new UpdateEventArgs();
- if (widgetData != null)
- {
- e.WidgetData = WidgetData.GetWidgetDataFromPtr(widgetData);
- }
+ e.ID = id;
if (bundle != null)
{
e.Bundle = new SWIGTYPE_p_bundle(bundle, false);
if (bundle != null)
{
e.Bundle = new SWIGTYPE_p_bundle(bundle, false);
@@
-589,9
+570,9
@@
namespace Tizen.NUI
_updateEventHandler?.Invoke(this, e);
}
_updateEventHandler?.Invoke(this, e);
}
- internal Widget
Instance
UpdateSignalType UpdateSignal()
+ internal WidgetUpdateSignalType UpdateSignal()
{
{
- Widget
InstanceUpdateSignalType ret = new WidgetInstance
UpdateSignalType(NDalicManualPINVOKE.Widget_UpdateSignal(swigCPtr), false);
+ Widget
UpdateSignalType ret = new Widget
UpdateSignalType(NDalicManualPINVOKE.Widget_UpdateSignal(swigCPtr), false);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}