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
Combined Stage and Window class, and removed Stage class
[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
8ebc3fc
..
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)
@@
-370,7
+370,7
@@
public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
get
{
Vector2 temp = new Vector2(0.0f,0.0f);
get
{
Vector2 temp = new Vector2(0.0f,0.0f);
-
GetProperty(
PanGestureDetector.Property.SCREEN_POSITION).Get( temp );
+
Dali.Object.GetProperty( swigCPtr,
PanGestureDetector.Property.SCREEN_POSITION).Get( temp );
return temp;
}
} public Vector2 ScreenDisplacement
return temp;
}
} public Vector2 ScreenDisplacement
@@
-378,7
+378,7
@@
public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
get
{
Vector2 temp = new Vector2(0.0f,0.0f);
get
{
Vector2 temp = new Vector2(0.0f,0.0f);
-
GetProperty(
PanGestureDetector.Property.SCREEN_DISPLACEMENT).Get( temp );
+
Dali.Object.GetProperty( swigCPtr,
PanGestureDetector.Property.SCREEN_DISPLACEMENT).Get( temp );
return temp;
}
} public Vector2 ScreenVelocity
return temp;
}
} public Vector2 ScreenVelocity
@@
-386,7
+386,7
@@
public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
get
{
Vector2 temp = new Vector2(0.0f,0.0f);
get
{
Vector2 temp = new Vector2(0.0f,0.0f);
-
GetProperty(
PanGestureDetector.Property.SCREEN_VELOCITY).Get( temp );
+
Dali.Object.GetProperty( swigCPtr,
PanGestureDetector.Property.SCREEN_VELOCITY).Get( temp );
return temp;
}
} public Vector2 LocalPosition
return temp;
}
} public Vector2 LocalPosition
@@
-394,7
+394,7
@@
public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
get
{
Vector2 temp = new Vector2(0.0f,0.0f);
get
{
Vector2 temp = new Vector2(0.0f,0.0f);
-
GetProperty(
PanGestureDetector.Property.LOCAL_POSITION).Get( temp );
+
Dali.Object.GetProperty( swigCPtr,
PanGestureDetector.Property.LOCAL_POSITION).Get( temp );
return temp;
}
} public Vector2 LocalDisplacement
return temp;
}
} public Vector2 LocalDisplacement
@@
-402,7
+402,7
@@
public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
get
{
Vector2 temp = new Vector2(0.0f,0.0f);
get
{
Vector2 temp = new Vector2(0.0f,0.0f);
-
GetProperty(
PanGestureDetector.Property.LOCAL_DISPLACEMENT).Get( temp );
+
Dali.Object.GetProperty( swigCPtr,
PanGestureDetector.Property.LOCAL_DISPLACEMENT).Get( temp );
return temp;
}
} public Vector2 LocalVelocity
return temp;
}
} public Vector2 LocalVelocity
@@
-410,7
+410,7
@@
public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
get
{
Vector2 temp = new Vector2(0.0f,0.0f);
get
{
Vector2 temp = new Vector2(0.0f,0.0f);
-
GetProperty(
PanGestureDetector.Property.LOCAL_VELOCITY).Get( temp );
+
Dali.Object.GetProperty( swigCPtr,
PanGestureDetector.Property.LOCAL_VELOCITY).Get( temp );
return temp;
}
} public bool Panning
return temp;
}
} public bool Panning
@@
-418,7
+418,7
@@
public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
get
{
bool temp = false;
get
{
bool temp = false;
-
GetProperty(
PanGestureDetector.Property.PANNING).Get( ref temp );
+
Dali.Object.GetProperty( swigCPtr,
PanGestureDetector.Property.PANNING).Get( ref temp );
return temp;
}
}
return temp;
}
}