diff options
| -rw-r--r--[-rwxr-xr-x] | Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/VisualElement.cs | 8 | ||||
| -rw-r--r-- | Xamarin.Forms.Platform.Tizen/Renderers/VisualElementRenderer.cs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/VisualElement.cs b/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/VisualElement.cs index 6e3d456c..670c48c5 100755..100644 --- a/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/VisualElement.cs +++ b/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/VisualElement.cs @@ -7,7 +7,7 @@ namespace Xamarin.Forms.PlatformConfiguration.TizenSpecific { public static readonly BindableProperty StyleProperty = BindableProperty.Create("ThemeStyle", typeof(string), typeof(VisualElement), default(string)); - public static readonly BindableProperty IsFocusAllowedProperty = BindableProperty.Create("IsFocusAllowed", typeof(bool), typeof(VisualElement), true); + public static readonly BindableProperty IsFocusAllowedProperty = BindableProperty.Create("IsFocusAllowed", typeof(bool?), typeof(VisualElement), null); [EditorBrowsable(EditorBrowsableState.Never)] public static readonly BindableProperty NextFocusDirectionProperty = BindableProperty.Create("NextFocusDirection", typeof(string), typeof(VisualElement), FocusDirection.None, propertyChanged: OnNextFocusDirectionPropertyChanged); @@ -47,9 +47,9 @@ namespace Xamarin.Forms.PlatformConfiguration.TizenSpecific return config; } - public static bool IsFocusAllowed(BindableObject element) + public static bool? IsFocusAllowed(BindableObject element) { - return (bool)element.GetValue(IsFocusAllowedProperty); + return (bool?)element.GetValue(IsFocusAllowedProperty); } public static void SetFocusAllowed(BindableObject element, bool value) @@ -57,7 +57,7 @@ namespace Xamarin.Forms.PlatformConfiguration.TizenSpecific element.SetValue(IsFocusAllowedProperty, value); } - public static bool IsFocusAllowed(this IPlatformElementConfiguration<Tizen, FormsElement> config) + public static bool? IsFocusAllowed(this IPlatformElementConfiguration<Tizen, FormsElement> config) { return IsFocusAllowed(config.Element); } diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/VisualElementRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/VisualElementRenderer.cs index 0d6b3036..a6c1c3a3 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/VisualElementRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/VisualElementRenderer.cs @@ -795,9 +795,9 @@ namespace Xamarin.Forms.Platform.Tizen if (!initialize) { var widget = NativeView as Widget; - if (widget != null) + if (widget != null && Specific.IsFocusAllowed(Element).HasValue) { - widget.AllowFocus(Specific.IsFocusAllowed(Element)); + widget.AllowFocus((bool)Specific.IsFocusAllowed(Element)); } else { |