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
Merge "Add PRIVATECOMMAND of ImfEvent in text-controller" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-sharp
/
sharp
/
internal
/
PanGestureDetector.cs
diff --git
a/plugins/dali-sharp/sharp/internal/PanGestureDetector.cs
b/plugins/dali-sharp/sharp/internal/PanGestureDetector.cs
index
6545cb5
..
0d7b557
100644
(file)
--- a/
plugins/dali-sharp/sharp/internal/PanGestureDetector.cs
+++ b/
plugins/dali-sharp/sharp/internal/PanGestureDetector.cs
@@
-46,7
+46,7
@@
public class PanGestureDetector : GestureDetector {
}
public override void Dispose() {
}
public override void Dispose() {
- if (!
Stage
.IsInstalled()) {
+ if (!
Window
.IsInstalled()) {
DisposeQueue.Instance.Add(this);
return;
}
DisposeQueue.Instance.Add(this);
return;
}
@@
-69,18
+69,18
@@
public class PanGestureDetector : GestureDetector {
public class DetectedEventArgs : EventArgs
{
public class DetectedEventArgs : EventArgs
{
- private
Actor _actor
;
+ private
View _view
;
private PanGesture _panGesture;
private PanGesture _panGesture;
- public
Actor Actor
+ public
View View
{
get
{
{
get
{
- return _
actor
;
+ return _
view
;
}
set
{
}
set
{
-
_actor
= value;
+
_view
= value;
}
}
}
}
@@
-139,7
+139,7
@@
public class DetectedEventArgs : EventArgs
DetectedEventArgs e = new DetectedEventArgs();
// Populate all members of "e" (PanGestureEventArgs) with real data
DetectedEventArgs e = new DetectedEventArgs();
// Populate all members of "e" (PanGestureEventArgs) with real data
- e.
Actor = Actor.GetActor
FromPtr(actor);
+ e.
View = View.GetView
FromPtr(actor);
e.PanGesture = Dali.PanGesture.GetPanGestureFromPtr(panGesture);
if (_panGestureEventHandler != null)
e.PanGesture = Dali.PanGesture.GetPanGestureFromPtr(panGesture);
if (_panGestureEventHandler != null)