summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeungkeun Lee <sngn.lee@samsung.com>2017-05-12 06:24:59 +0000
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>2017-05-12 06:24:59 +0000
commitd01be6c15e123bb738443e978838f54c97e08908 (patch)
treec5e1a5350deefef4f699bd333ecb06d46ae677f1
parentacedfb8b5db083b901c16e54f8658abb03413343 (diff)
parentf5acf4941730676bb16c2e6fc97d0d28bded6445 (diff)
downloadxamarin-forms-d01be6c15e123bb738443e978838f54c97e08908.tar.gz
xamarin-forms-d01be6c15e123bb738443e978838f54c97e08908.tar.bz2
xamarin-forms-d01be6c15e123bb738443e978838f54c97e08908.zip
Merge "Fix gesture issue in BoxView" into tizen
-rw-r--r--Xamarin.Forms.Platform.Tizen/Renderers/BoxViewRenderer.cs18
-rw-r--r--Xamarin.Forms.Platform.Tizen/Renderers/ViewRenderer.cs2
2 files changed, 9 insertions, 11 deletions
diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/BoxViewRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/BoxViewRenderer.cs
index b0651340..6d3ed38e 100644
--- a/Xamarin.Forms.Platform.Tizen/Renderers/BoxViewRenderer.cs
+++ b/Xamarin.Forms.Platform.Tizen/Renderers/BoxViewRenderer.cs
@@ -4,20 +4,18 @@ using ERectangle = ElmSharp.Rectangle;
namespace Xamarin.Forms.Platform.Tizen
{
- public class BoxViewRenderer : VisualElementRenderer<BoxView>
+ public class BoxViewRenderer : ViewRenderer<BoxView, ERectangle>
{
- ERectangle _control;
-
public BoxViewRenderer()
{
}
protected override void OnElementChanged(ElementChangedEventArgs<BoxView> e)
{
- if (_control == null)
+ if (Control == null)
{
- _control = new ERectangle(Forms.Context.MainWindow);
- SetNativeControl(_control);
+ var rectangle = new ERectangle(Forms.Context.MainWindow);
+ SetNativeControl(rectangle);
}
if (e.NewElement != null)
@@ -54,19 +52,19 @@ namespace Xamarin.Forms.Platform.Tizen
if (Element.BackgroundColor.IsDefault)
{
// Set to default color. (Transparent)
- _control.Color = EColor.Transparent;
+ Control.Color = EColor.Transparent;
}
else
{
// Use BackgroundColor only if color is default and background color is not default.
- _control.Color = Element.BackgroundColor.MultiplyAlpha(Element.Opacity).ToNative();
+ Control.Color = Element.BackgroundColor.MultiplyAlpha(Element.Opacity).ToNative();
}
}
else
{
// Color has higer priority than BackgroundColor.
- _control.Color = Element.Color.MultiplyAlpha(Element.Opacity).ToNative();
+ Control.Color = Element.Color.MultiplyAlpha(Element.Opacity).ToNative();
}
}
}
-}
+} \ No newline at end of file
diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ViewRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/ViewRenderer.cs
index bf1891bf..f104ba42 100644
--- a/Xamarin.Forms.Platform.Tizen/Renderers/ViewRenderer.cs
+++ b/Xamarin.Forms.Platform.Tizen/Renderers/ViewRenderer.cs
@@ -7,7 +7,7 @@ namespace Xamarin.Forms.Platform.Tizen
/// </summary>
public abstract class ViewRenderer<TView, TNativeView> : VisualElementRenderer<TView>
where TView : View
- where TNativeView : Widget
+ where TNativeView : EvasObject
{
GestureDetector _gestureDetector;