summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKangho Hur <kangho.hur@samsung.com>2017-03-23 02:27:20 (GMT)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2017-03-23 02:27:20 (GMT)
commitef7c465fc6cdac38afef92a27cba334681c25358 (patch)
tree3c55a1cdc6439619a8c9a60e7f89827842ec64b6
parent1da5eba617deb18dafaee2a0275afbcb0cd8b7b7 (diff)
parent00f4ce2a48cce2752357bfa8e2047314a479a3b1 (diff)
downloadxamarin-forms-ef7c465fc6cdac38afef92a27cba334681c25358.zip
xamarin-forms-ef7c465fc6cdac38afef92a27cba334681c25358.tar.gz
xamarin-forms-ef7c465fc6cdac38afef92a27cba334681c25358.tar.bz2
Merge "Fix warning" into tizen
-rw-r--r--Xamarin.Forms.Platform.Tizen/GestureHandler.cs6
-rw-r--r--Xamarin.Forms.Platform.Tizen/PanGestureHandler.cs2
-rw-r--r--Xamarin.Forms.Platform.Tizen/PinchGestureHandler.cs2
-rw-r--r--Xamarin.Forms.Platform.Tizen/TapGestureHandler.cs8
4 files changed, 6 insertions, 12 deletions
diff --git a/Xamarin.Forms.Platform.Tizen/GestureHandler.cs b/Xamarin.Forms.Platform.Tizen/GestureHandler.cs
index 0d1bb93..d89bea5 100644
--- a/Xamarin.Forms.Platform.Tizen/GestureHandler.cs
+++ b/Xamarin.Forms.Platform.Tizen/GestureHandler.cs
@@ -15,6 +15,7 @@ namespace Xamarin.Forms.Platform.Tizen
protected GestureHandler(IGestureRecognizer recognizer)
{
Recognizer = recognizer;
+ Recognizer.PropertyChanged += OnRecognizerPropertyChanged;
}
public virtual event PropertyChangedEventHandler PropertyChanged;
@@ -46,5 +47,10 @@ namespace Xamarin.Forms.Platform.Tizen
{
OnCanceled(sender, data);
}
+
+ protected virtual void OnRecognizerPropertyChanged(object sender, PropertyChangedEventArgs e)
+ {
+ PropertyChanged?.Invoke(this, e);
+ }
}
} \ No newline at end of file
diff --git a/Xamarin.Forms.Platform.Tizen/PanGestureHandler.cs b/Xamarin.Forms.Platform.Tizen/PanGestureHandler.cs
index ec1e6de..0296da0 100644
--- a/Xamarin.Forms.Platform.Tizen/PanGestureHandler.cs
+++ b/Xamarin.Forms.Platform.Tizen/PanGestureHandler.cs
@@ -20,8 +20,6 @@ namespace Xamarin.Forms.Platform.Tizen
}
}
- public override event PropertyChangedEventHandler PropertyChanged;
-
protected override void OnStarted(View sender, object data)
{
_currentPanGestureId++;
diff --git a/Xamarin.Forms.Platform.Tizen/PinchGestureHandler.cs b/Xamarin.Forms.Platform.Tizen/PinchGestureHandler.cs
index c22b7e2..abb4f7b 100644
--- a/Xamarin.Forms.Platform.Tizen/PinchGestureHandler.cs
+++ b/Xamarin.Forms.Platform.Tizen/PinchGestureHandler.cs
@@ -22,8 +22,6 @@ namespace Xamarin.Forms.Platform.Tizen
}
}
- public override event PropertyChangedEventHandler PropertyChanged;
-
protected override void OnStarted(View sender, object data)
{
var geometry = Platform.GetRenderer(sender).NativeView.Geometry;
diff --git a/Xamarin.Forms.Platform.Tizen/TapGestureHandler.cs b/Xamarin.Forms.Platform.Tizen/TapGestureHandler.cs
index f8e0907..b57fe79 100644
--- a/Xamarin.Forms.Platform.Tizen/TapGestureHandler.cs
+++ b/Xamarin.Forms.Platform.Tizen/TapGestureHandler.cs
@@ -8,7 +8,6 @@ namespace Xamarin.Forms.Platform.Tizen
{
public TapGestureHandler(IGestureRecognizer recognizer) : base(recognizer)
{
- recognizer.PropertyChanged += OnRecognizerPropertyChanged;
}
public override GestureLayer.GestureType Type
@@ -29,8 +28,6 @@ namespace Xamarin.Forms.Platform.Tizen
}
}
- public override event PropertyChangedEventHandler PropertyChanged;
-
protected override void OnStarted(View sender, object data)
{
}
@@ -47,10 +44,5 @@ namespace Xamarin.Forms.Platform.Tizen
protected override void OnCanceled(View sender, object data)
{
}
-
- void OnRecognizerPropertyChanged(object sender, PropertyChangedEventArgs e)
- {
- PropertyChanged?.Invoke(this, e);
- }
}
} \ No newline at end of file