diff options
author | WonYoung Choi <wy80.choi@samsung.com> | 2017-04-14 12:56:04 +0900 |
---|---|---|
committer | Kangho Hur <kangho.hur@samsung.com> | 2017-04-24 13:39:49 +0900 |
commit | 35c94dd8866747738cb67e52b37f9a64b2f47f34 (patch) | |
tree | 40217252e68f0acae7fe4c35148f4e22d5ef6bc8 /Xamarin.Forms.Platform.Tizen | |
parent | e66e1ed4a2bbac9395a458c935757d0afaa985db (diff) | |
download | xamarin-forms-35c94dd8866747738cb67e52b37f9a64b2f47f34.tar.gz xamarin-forms-35c94dd8866747738cb67e52b37f9a64b2f47f34.tar.bz2 xamarin-forms-35c94dd8866747738cb67e52b37f9a64b2f47f34.zip |
Fix FocusDirection to string type
Fix FocusDirection to string type to avoid invalid reference in Tizen.Xamarin.Forms.Extension
Change-Id: Ie452f14a32dbe0b5776ab28996eb52c81e8223c4
Diffstat (limited to 'Xamarin.Forms.Platform.Tizen')
-rw-r--r-- | Xamarin.Forms.Platform.Tizen/Extensions/FocusDirectionExtensions.cs | 29 | ||||
-rw-r--r-- | Xamarin.Forms.Platform.Tizen/Renderers/VisualElementRenderer.cs | 18 |
2 files changed, 15 insertions, 32 deletions
diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/FocusDirectionExtensions.cs b/Xamarin.Forms.Platform.Tizen/Extensions/FocusDirectionExtensions.cs deleted file mode 100644 index fe7d090f..00000000 --- a/Xamarin.Forms.Platform.Tizen/Extensions/FocusDirectionExtensions.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Xamarin.Forms.PlatformConfiguration.TizenSpecific; -using EFocusDirection = ElmSharp.FocusDirection; - -namespace Xamarin.Forms.Platform.Tizen -{ - public static class FocusDirectionExtensions - { - public static EFocusDirection ToNative(this FocusDirection direction) - { - switch (direction) - { - case FocusDirection.Back: - return EFocusDirection.Previous; - case FocusDirection.Forward: - return EFocusDirection.Next; - case FocusDirection.Up: - return EFocusDirection.Up; - case FocusDirection.Down: - return EFocusDirection.Down; - case FocusDirection.Right: - return EFocusDirection.Right; - case FocusDirection.Left: - return EFocusDirection.Left; - default: - return EFocusDirection.Next; - } - } - } -} diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/VisualElementRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/VisualElementRenderer.cs index 51170bd6..d7f77150 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/VisualElementRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/VisualElementRenderer.cs @@ -5,6 +5,7 @@ using System.ComponentModel; using ElmSharp; using ESize = ElmSharp.Size; using ERect = ElmSharp.Rect; +using EFocusDirection = ElmSharp.FocusDirection; using Specific = Xamarin.Forms.PlatformConfiguration.TizenSpecific.VisualElement; using XFocusDirection = Xamarin.Forms.PlatformConfiguration.TizenSpecific.FocusDirection; @@ -809,7 +810,7 @@ namespace Xamarin.Forms.Platform.Tizen var widget = NativeView as Widget; if (widget != null) { - widget.FocusNext(direction.ToNative()); + widget.FocusNext(ConvertToNativeFocusDirection(direction)); } else { @@ -818,7 +819,7 @@ namespace Xamarin.Forms.Platform.Tizen } } - void SetNextFocusViewInternal(XFocusDirection direction) + void SetNextFocusViewInternal(string direction) { var widget = NativeView as Widget; if (widget != null) @@ -850,7 +851,7 @@ namespace Xamarin.Forms.Platform.Tizen } if (nativeControl != null) { - widget.SetNextFocusObject(nativeControl, direction.ToNative()); + widget.SetNextFocusObject(nativeControl, ConvertToNativeFocusDirection(direction)); } } else @@ -994,6 +995,17 @@ namespace Xamarin.Forms.Platform.Tizen NativeView.EvasMap = map; } } + + EFocusDirection ConvertToNativeFocusDirection(string direction) { + if (direction == XFocusDirection.Back) return EFocusDirection.Previous; + if (direction == XFocusDirection.Forward) return EFocusDirection.Next; + if (direction == XFocusDirection.Up) return EFocusDirection.Up; + if (direction == XFocusDirection.Down) return EFocusDirection.Down; + if (direction == XFocusDirection.Right) return EFocusDirection.Right; + if (direction == XFocusDirection.Left) return EFocusDirection.Left; + + return EFocusDirection.Next; + } } internal static class Settings |