# Auto-generated from csapi-tizenfx.spec.in by makespec.sh
%define TIZEN_NET_API_VERSION 10
-%define TIZEN_NET_RPM_VERSION 10.0.0.16997+nui22110
-%define TIZEN_NET_NUGET_VERSION 10.0.0.16997
+%define TIZEN_NET_RPM_VERSION 10.0.0.999+nui22111
+%define TIZEN_NET_NUGET_VERSION 10.0.0.99999
%define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework
%define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref
NUGET_VERSION=10.0.0.99999
# RPM Version Suffix
-RPM_VERSION_SUFFIX=nui22110
+RPM_VERSION_SUFFIX=nui22111
/// <since_tizen> 3 </since_tizen>
protected virtual void OnCreate()
{
- string locale = ULocale.GetDefaultLocale();
- ChangeCurrentUICultureInfo(locale);
- ChangeCurrentCultureInfo(locale);
+ if (!GlobalizationMode.Invariant)
+ {
+ string locale = ULocale.GetDefaultLocale();
+ ChangeCurrentUICultureInfo(locale);
+ ChangeCurrentCultureInfo(locale);
+ }
+ else
+ {
+ Log.Warn(LogTag, "Run in invariant mode");
+ }
Created?.Invoke(this, EventArgs.Empty);
}
/// <since_tizen> 3 </since_tizen>
protected virtual void OnLocaleChanged(LocaleChangedEventArgs e)
{
- ChangeCurrentUICultureInfo(e.Locale);
+ if (!GlobalizationMode.Invariant)
+ {
+ ChangeCurrentUICultureInfo(e.Locale);
+ }
+
LocaleChanged?.Invoke(this, e);
}
/// <since_tizen> 3 </since_tizen>
protected virtual void OnRegionFormatChanged(RegionFormatChangedEventArgs e)
{
- ChangeCurrentCultureInfo(e.Region);
+ if (!GlobalizationMode.Invariant)
+ {
+ ChangeCurrentCultureInfo(e.Region);
+ }
+
RegionFormatChanged?.Invoke(this, e);
}
}
}
+ internal static class GlobalizationMode
+ {
+ private static int _invariant = -1;
+
+ internal static bool Invariant
+ {
+ get
+ {
+ if (_invariant == -1)
+ {
+ string value = Environment.GetEnvironmentVariable("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT");
+ _invariant = value != null ? (value.Equals("1") ? 1 : 0) : 0;
+ }
+
+ return _invariant != 0;
+ }
+ }
+ }
+
internal class ULocale
{
private const int ULOC_FULLNAME_CAPACITY = 157;
private static readonly Dictionary<string, string> _cultureNames = new Dictionary<string, string>();
private static readonly object _lock = new object();
private const string _pathCultureInfoXml = "/usr/share/dotnet.tizen/framework/i18n/CultureInfo.xml";
- private static readonly CultureInfo _cultureInfo = new CultureInfo("en-US");
public static void Initialize()
{
Initialize();
}
- if (_cultureNames.TryGetValue(locale.ToLower(_cultureInfo), out string cultureName))
+ if (_cultureNames.TryGetValue(locale.ToLowerInvariant(), out string cultureName))
{
return cultureName;
}
disappearedPage.UnregisterDefaultLabel();
//We can call disappearedPage.NotifyAccessibilityStatesChange
//To reduce accessibility events, we are using currently highlighted view instead
- View curHighlightedView = Accessibility.Accessibility.Instance.GetCurrentlyHighlightedView();
+ View curHighlightedView = Accessibility.Accessibility.GetCurrentlyHighlightedView();
if (curHighlightedView != null)
{
curHighlightedView.NotifyAccessibilityStatesChange(new AccessibilityStates(AccessibilityState.Visible, AccessibilityState.Showing), AccessibilityStatesNotifyMode.Single);
if (loopEnabled) startY = ((dummyItemsForLoop + startItemIdx) * itemHeight) + startScrollOffset;
// + 2 for non loop picker center align
- else startY = ((2 + startItemIdx) * itemHeight) + startScrollOffset;
+ else
+ {
+ startY = ((2 + startItemIdx) * itemHeight) + startScrollOffset;
+ currentValue = currentValue - minValue + 2;
+ }
pickerScroller.ScrollTo(startY, false);
}
}
}
+ /// <summary>
+ /// Initialize AT-SPI object.
+ /// </summary>
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public override void OnInitialize()
+ {
+ base.OnInitialize();
+ SetAccessibilityConstructor(Role.List);
+ }
/// <summary>
/// Scroll to specified item
layoutChanged = true;
Add(itemLabel);
}
- itemLabel.AppendAccessibilityRelation(this, AccessibilityRelationType.ControlledBy);
- this.AppendAccessibilityRelation(itemLabel, AccessibilityRelationType.LabelledBy);
}
return itemLabel;
}
//need to consider horizontal/vertical!
WidthSpecification = LayoutParamPolicies.MatchParent,
HeightSpecification = 2,
- ExcludeLayouting = true
+ ExcludeLayouting = true,
+ AccessibilityHidden = true
};
layoutChanged = true;
Add(itemSeperator);
}
/// <summary>
+ /// Get accessibility name.
+ /// </summary>
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ protected override string AccessibilityGetName()
+ {
+ return Label.Text + ", " + SubLabel.Text;
+ }
+
+ /// <summary>
/// Creates Item's text part.
/// </summary>
/// <return>The created Item's text part.</return>
return new TextLabel(style)
{
HorizontalAlignment = HorizontalAlignment.Begin,
- VerticalAlignment = VerticalAlignment.Center
+ VerticalAlignment = VerticalAlignment.Center,
+ AccessibilityHidden = true
};
}
else
{
isAm = true;
- hourPicker.CurrentValue = currentTime.Hour;
+ if (currentTime.Hour == 0) hourPicker.CurrentValue = 12;
+ else hourPicker.CurrentValue = currentTime.Hour;
ampmPicker.CurrentValue = 1;
}
}
ampmPicker.ValueChanged += OnAmpmValueChanged;
currentTime = DateTime.Now;
- Console.WriteLine(" Time " + currentTime.Hour + " " + currentTime.Minute);
if (currentTime.Hour > 12)
{
ampmPicker.CurrentValue = 2;
hourPicker.CurrentValue = currentTime.Hour - 12;
}
else
+ {
+ ampmPicker.CurrentValue = 1;
hourPicker.CurrentValue = currentTime.Hour;
+ }
minutePicker.CurrentValue = currentTime.Minute;
{
if (isAm)
{
- if (e.Value == 12) ChangeTime(12, 0, true);
+ if (e.Value == 12) ChangeTime(0, 0, true);
else ChangeTime(e.Value, 0, true);
}
else
{
- if (e.Value == 12) ChangeTime(0, 0, true);
+ if (e.Value == 12) ChangeTime(12, 0, true);
else ChangeTime(e.Value + 12, 0, true);
}
}
if (e.Value == 1)
{ //AM
- if (currentTime.Hour > 12 || currentTime.Hour == 0)
- {
- if (currentTime.Hour == 0) ChangeTime(12, 0, true);
- else ChangeTime(currentTime.Hour - 12, 0, true);
- }
+ if (currentTime.Hour == 12) ChangeTime(0, 0, true);
+ else ChangeTime(currentTime.Hour - 12, 0, true);
+
isAm = true;
}
else
{ //PM
- if (currentTime.Hour > 0 && currentTime.Hour <= 12)
- {
- if (currentTime.Hour == 12) ChangeTime(0, 0, true);
- else ChangeTime(currentTime.Hour + 12, 0, true);
- }
+ if (currentTime.Hour == 0) ChangeTime(12, 0, true);
+ else ChangeTime(currentTime.Hour + 12, 0, true);
+
isAm = false;
}
/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
public delegate void resChangeCb(object sender, ResourcesChangedEventArgs e);
- internal event EventHandler<ResourcesChangedEventArgs> XamlResourceChanged;
-
internal override void OnResourcesChanged(object sender, ResourcesChangedEventArgs e)
{
base.OnResourcesChanged(sender, e);
- XamlResourceChanged?.Invoke(sender, e);
}
public ResourceDictionary XamlResources
internal override void OnParentResourcesChanged(IEnumerable<KeyValuePair<string, object>> values)
{
+ if (values == null)
+ return;
+
if (!((IResourcesProvider)this).IsResourcesCreated || XamlResources.Count == 0)
{
base.OnParentResourcesChanged(values);
if (innerKeys.Add(value.Key))
changedResources.Add(value);
}
- OnResourcesChanged(changedResources);
+ if (changedResources.Count != 0)
+ OnResourcesChanged(changedResources);
}
internal Application(global::System.IntPtr cPtr, bool cMemoryOwn) : base(cPtr, cMemoryOwn)
public void Do()
{
var type = globalDataList.GatheredTypes[typeIndex];
- globalDataList.GatheredProperties.Add(type.GetProperty(propertyName));
+ PropertyInfo propertyInfo = null;
+ try
+ {
+ propertyInfo = type.GetProperty(propertyName);
+ }
+#pragma warning disable CA1031 // Do not catch general exception types
+ catch (Exception)
+#pragma warning restore CA1031 // Do not catch general exception types
+ {
+ propertyInfo = type.GetProperty(propertyName, BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.Instance);
+ }
+
+ if (null == propertyInfo)
+ {
+ throw new Exception($"Can't find property {propertyName} from type {type.FullName}");
+ }
+ globalDataList.GatheredProperties.Add(propertyInfo);
}
private int typeIndex;
{
internal static partial class Accessibility
{
- [DllImport(NDalicPINVOKE.Lib, EntryPoint = "csharp_dali_accessibility_get_status")]
- [return: MarshalAs(UnmanagedType.U1)]
- public static extern bool GetStatus(HandleRef jarg1);
-
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "csharp_dali_accessibility_say")]
[return: MarshalAs(UnmanagedType.U1)]
- public static extern bool Say(HandleRef jarg1, string jarg2, bool jarg3, IntPtr jarg4);
+ public static extern bool Say(string jarg1, bool jarg2, IntPtr jarg3);
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "csharp_dali_accessibility_pause_resume")]
- public static extern void PauseResume(HandleRef jarg1, bool jarg2);
+ public static extern void PauseResume(bool jarg1);
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "csharp_dali_accessibility_stop_reading")]
- public static extern void StopReading(HandleRef jarg1, bool jarg2);
+ public static extern void StopReading(bool jarg1);
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "csharp_dali_accessibility_suppress_screen_reader")]
[return: MarshalAs(UnmanagedType.U1)]
- public static extern bool SuppressScreenReader(HandleRef jarg1, bool jarg2);
+ public static extern bool SuppressScreenReader(bool jarg1);
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "csharp_dali_accessibility_BridgeEnableAutoInit")]
public static extern void BridgeEnableAutoInit();
public delegate bool AccessibilityDeselectChild(IntPtr self, int childIndex);
[EditorBrowsable(EditorBrowsableState.Never)]
public AccessibilityDeselectChild DeselectChild; // 35
+
+ [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+ public delegate uint AccessibilityGetInterfaces(IntPtr self);
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public AccessibilityGetInterfaces GetInterfaces; // 36
}
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_SetAccessibilityConstructor_NUI")]
- public static extern void DaliToolkitDevelControlSetAccessibilityConstructor(HandleRef arg1_self, int arg2_role, int arg3_iface);
+ public static extern void DaliToolkitDevelControlSetAccessibilityConstructor(HandleRef arg1_self, int arg2_role);
[DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Accessibility_DuplicateString")]
public static extern IntPtr DaliAccessibilityDuplicateString(string arg);
/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
public bool StopOnResourceDictionary { get; }
public bool VisitNodeOnDataTemplate => true;
public bool SkipChildren(INode node, INode parentNode) => false;
- public bool IsResourceDictionary(ElementNode node) => typeof(ResourceDictionary).IsAssignableFrom(Context.Types[node]);
+ public bool IsResourceDictionary(ElementNode node) => Context.Types.TryGetValue(node, out var type) && typeof(ResourceDictionary).IsAssignableFrom(type);
public void Visit(ValueNode node, INode parentNode)
{
var parentElement = parentNode as IElementNode;
var value = Values[node];
- var source = Values[parentNode];
+ if (!Values.TryGetValue(parentNode, out var source) && Context.ExceptionHandler != null)
+ return;
XmlName propertyName;
if (TryGetPropertyName(node, parentNode, out propertyName))
parentElement = parentNode as IElementNode;
}
- var value = Values[node];
+ if (!Values.TryGetValue(node, out var value) && Context.ExceptionHandler != null)
+ return;
if (propertyName != XmlName.Empty || TryGetPropertyName(node, parentNode, out propertyName))
{
if (parentElement.SkipProperties.Contains(propertyName))
return;
- var source = Values[parentNode];
+ if (!Values.TryGetValue(parentNode, out var source) && Context.ExceptionHandler != null)
+ return;
ProvideValue(ref value, node, source, propertyName);
SetPropertyValue(source, propertyName, value, Context.RootElement, node, Context, node);
}
else if (IsCollectionItem(node, parentNode) && parentNode is IElementNode)
{
- var source = Values[parentNode];
+ if (!Values.TryGetValue(parentNode, out var source) && Context.ExceptionHandler != null)
+ return;
ProvideValue(ref value, node, source, XmlName.Empty);
string contentProperty;
Exception xpe = null;
xpe = xpe ?? new XamlParseException($"Can not set the content of {((IElementNode)parentNode).XmlType.Name} as it doesn't have a ContentPropertyAttribute", node);
if (Context.ExceptionHandler != null)
Context.ExceptionHandler(xpe);
- throw xpe;
+ else
+ throw xpe;
}
else if (IsCollectionItem(node, parentNode) && parentNode is ListNode)
{
- var source = Values[parentNode.Parent];
+ if (!Values.TryGetValue(parentNode.Parent, out var source) && Context.ExceptionHandler != null)
+ return;
ProvideValue(ref value, node, source, XmlName.Empty);
var parentList = (ListNode)parentNode;
if (Skips.Contains(parentList.XmlName))
{
(serviceProvider.IProvideValueTarget as XamlValueTargetProvider).TargetProperty = GetTargetProperty(source, propertyName, Context, node);
}
-
- if (markupExtension != null)
- value = markupExtension.ProvideValue(serviceProvider);
- else if (valueProvider != null)
- value = valueProvider.ProvideValue(serviceProvider);
+ try {
+ if (markupExtension != null)
+ value = markupExtension.ProvideValue(serviceProvider);
+ else if (valueProvider != null)
+ value = valueProvider.ProvideValue(serviceProvider);
+ } catch (Exception e) {
+ if (Context.ExceptionHandler != null)
+ Context.ExceptionHandler(e);
+ else
+ throw;
+ }
}
static string GetContentPropertyName(IEnumerable<CustomAttributeData> attributes)
if (xKey != null)
resourceDictionary.Add(xKey, value);
+ else if (value is XamlStyle)
+ resourceDictionary.Add((XamlStyle)value);
else if (value is ResourceDictionary)
resourceDictionary.Add((ResourceDictionary)value);
else
/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
}
if (value is Element element)
{
- if (null != Application.Current)
- {
- Application.Current.XamlResourceChanged += element.OnResourcesChanged;
- }
-
element.IsCreateByXaml = true;
element.LineNumber = node.LineNumber;
element.LinePosition = node.LinePosition;
object ret = Activator.CreateInstance(nodeType, BindingFlags.CreateInstance | BindingFlags.Public | BindingFlags.Instance | BindingFlags.OptionalParamBinding, null, arguments, CultureInfo.CurrentCulture);
if (ret is Element element)
{
- if (null != Application.Current)
- {
- Application.Current.XamlResourceChanged += element.OnResourcesChanged;
- }
-
element.IsCreateByXaml = true;
element.LineNumber = (node as ElementNode)?.LineNumber ?? -1;
element.LinePosition = (node as ElementNode)?.LinePosition ?? -1;
value = Activator.CreateInstance(nodeType);
if (value is Element element)
{
- if (null != Application.Current)
- {
- Application.Current.XamlResourceChanged += element.OnResourcesChanged;
- }
-
element.IsCreateByXaml = true;
element.LineNumber = (node as ElementNode)?.LineNumber ?? -1;
element.LinePosition = (node as ElementNode)?.LinePosition ?? -1;
/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
public void Visit(ValueNode node, INode parentNode)
{
- if (!typeof(ResourceDictionary).IsAssignableFrom(Context.Types[((IElementNode)parentNode)]))
+ if (!Context.Types.TryGetValue((IElementNode)parentNode, out var type) || !typeof(ResourceDictionary).IsAssignableFrom(type))
return;
node.Accept(new ApplyPropertiesVisitor(Context, stopOnResourceDictionary: false), parentNode);
public void Visit(ElementNode node, INode parentNode)
{
- var value = Values[node];
+ if (!Values.TryGetValue(node, out var value) && Context.ExceptionHandler != null)
+ return;
XmlName propertyName;
//Set RD to VE
if (typeof(ResourceDictionary).IsAssignableFrom(Context.Types[node]) && ApplyPropertiesVisitor.TryGetPropertyName(node, parentNode, out propertyName))
{
- if ((propertyName.LocalName == "Resources" ||
- propertyName.LocalName.EndsWith(".Resources", StringComparison.Ordinal)) && value is ResourceDictionary)
+ if ((propertyName.LocalName == "XamlResources" ||
+ propertyName.LocalName.EndsWith(".XamlResources", StringComparison.Ordinal)) && value is ResourceDictionary)
{
var source = Values[parentNode];
ApplyPropertiesVisitor.SetPropertyValue(source, propertyName, value, Context.RootElement, node, Context, node);
//Only proceed further if the node is a keyless RD
if (parentNode is IElementNode
- && typeof(ResourceDictionary).IsAssignableFrom(Context.Types[((IElementNode)parentNode)])
+ && Context.Types.TryGetValue((IElementNode)parentNode, out var parentType)
+ && typeof(ResourceDictionary).IsAssignableFrom(parentType)
&& !((IElementNode)parentNode).Properties.ContainsKey(XmlName.xKey))
node.Accept(new ApplyPropertiesVisitor(Context, stopOnResourceDictionary: false), parentNode);
else if (parentNode is ListNode
if (enode is null)
return false;
if (parentNode is IElementNode
- && typeof(ResourceDictionary).IsAssignableFrom(Context.Types[((IElementNode)parentNode)])
+ && Context.Types.TryGetValue((IElementNode)parentNode, out var parentType)
+ && typeof(ResourceDictionary).IsAssignableFrom(parentType)
&& !((IElementNode)parentNode).Properties.ContainsKey(XmlName.xKey))
return true;
if (parentNode is ListNode
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+/*
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
internal interface IResourcesLoader
{
T CreateFromResource<T>(string resourcePath, Assembly assembly, IXmlLineInfo lineInfo) where T : new();
- string GetResource(string resourcePath, Assembly assembly, IXmlLineInfo lineInfo);
+ string GetResource(string resourcePath, Assembly assembly, object target, IXmlLineInfo lineInfo);
}
}
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+/*
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
{
public T CreateFromResource<T>(string resourcePath, Assembly assembly, IXmlLineInfo lineInfo) where T : new()
{
- var alternateResource = ResourceLoader.ResourceProvider?.Invoke(assembly.GetName(), resourcePath);
+ var rd = new T();
+ var resourceLoadingResponse = ResourceLoader.ResourceProvider?.Invoke(new ResourceLoader.ResourceLoadingQuery
+ {
+ AssemblyName = assembly.GetName(),
+ ResourcePath = resourcePath,
+ Instance = rd
+ });
+ var alternateResource = resourceLoadingResponse?.ResourceContent;
if (alternateResource != null)
{
- var rd = new T();
rd.LoadFromXaml(alternateResource);
return rd;
}
throw new XamlParseException($"No resource found for '{resourceId}'.", lineInfo);
using (var reader = new StreamReader(stream))
{
- var rd = new T();
rd.LoadFromXaml(reader.ReadToEnd());
return rd;
}
}
}
- public string GetResource(string resourcePath, Assembly assembly, IXmlLineInfo lineInfo)
+ public string GetResource(string resourcePath, Assembly assembly, object target, IXmlLineInfo lineInfo)
{
- var alternateResource = ResourceLoader.ResourceProvider?.Invoke(assembly.GetName(), resourcePath);
+ var resourceLoadingResponse = ResourceLoader.ResourceProvider?.Invoke(new ResourceLoader.ResourceLoadingQuery {
+ AssemblyName = assembly.GetName(),
+ ResourcePath = resourcePath,
+ Instance = target
+ });
+ var alternateResource = resourceLoadingResponse?.ResourceContent;
if (alternateResource != null)
return alternateResource;
/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
var rootnode = new RuntimeRootNode(new XmlType(reader.NamespaceURI, reader.Name, null), ret, (IXmlNamespaceResolver)reader);
XamlParser.ParseXaml(rootnode, reader);
+ var doNotThrow = ResourceLoader.ExceptionHandler != null || Internals.XamlLoader.DoNotThrowOnExceptions;
+ void ehandler(Exception e) => ResourceLoader.ExceptionHandler?.Invoke((e, path));
Visit(rootnode, new HydrationContext
{
RootElement = ret,
#pragma warning disable 0618
- ExceptionHandler = ResourceLoader.ExceptionHandler ?? (Internals.XamlLoader.DoNotThrowOnExceptions ? e => { } : (Action<Exception>)null)
+ ExceptionHandler = doNotThrow ? ehandler : (Action<Exception>)null
#pragma warning restore 0618
});
break;
var rootnode = new RuntimeRootNode(new XmlType(reader.NamespaceURI, reader.Name, null), view, (IXmlNamespaceResolver)reader);
XamlParser.ParseXaml(rootnode, reader);
+ var doNotThrow = ResourceLoader.ExceptionHandler != null || Internals.XamlLoader.DoNotThrowOnExceptions;
+ void ehandler(Exception e) => ResourceLoader.ExceptionHandler?.Invoke((e, XamlFilePathAttribute.GetFilePathForObject(view)));
Visit(rootnode, new HydrationContext
{
RootElement = view,
#pragma warning disable 0618
- ExceptionHandler = ResourceLoader.ExceptionHandler ?? (Internals.XamlLoader.DoNotThrowOnExceptions ? e => { } : (Action<Exception>)null)
+ ExceptionHandler = doNotThrow ? ehandler : (Action<Exception>)null
#pragma warning restore 0618
});
break;
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+/*
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
{
internal static class ResourceLoader
{
- static Func<AssemblyName, string, string> resourceProvider = (asmName, path) =>
- {
- if (typeof(Theme).Assembly.GetName().FullName != asmName.FullName)
+ static Func<ResourceLoadingQuery, ResourceLoadingResponse> _resourceProvider = (resourceLoadingQuery) => {
+ if (typeof(Theme).Assembly.GetName().FullName != resourceLoadingQuery.AssemblyName.FullName)
{
string resource = Tizen.Applications.Application.Current.DirectoryInfo.Resource;
- path = resource + path;
+ resourceLoadingQuery.ResourcePath = resource + resourceLoadingQuery.ResourcePath;
}
- string ret = File.ReadAllText(path);
- return ret;
+ string ret = File.ReadAllText(resourceLoadingQuery.ResourcePath);
+ return new ResourceLoadingResponse { ResourceContent = ret };
};
-
- //takes a resource path, returns string content
- public static Func<AssemblyName, string, string> ResourceProvider
+ public static Func<ResourceLoadingQuery, ResourceLoadingResponse> ResourceProvider
{
- get => resourceProvider;
+ get => _resourceProvider;
internal set
{
- DesignMode.IsDesignModeEnabled = true;
- resourceProvider = value;
+ DesignMode.IsDesignModeEnabled = value != null;
+ _resourceProvider = value;
}
}
- internal static Action<Exception> ExceptionHandler { get; set; }
+ internal static Action<(Exception exception, string filepath)> ExceptionHandler { get; set; }
+
+ public class ResourceLoadingQuery
+ {
+ public AssemblyName AssemblyName { get; set; }
+ public string ResourcePath { get; set; }
+ public object Instance { get; set; }
+ }
+
+ public class ResourceLoadingResponse
+ {
+ public string ResourceContent { get; set; }
+ public bool UseDesignProperties { get; set; }
+ }
}
}
public IStyle Style
{
get { return style; }
- set { SetStyle(ImplicitStyle, ClassStyles, value); }
+ set
+ {
+ if (style == value)
+ return;
+ if (value != null && !value.TargetType.IsAssignableFrom(TargetType))
+ NUILog.Error($"Style TargetType {value.TargetType.FullName} is not compatible with element target type {TargetType}");
+ SetStyle(ImplicitStyle, ClassStyles, value);
+ }
}
public IList<string> StyleClass
if (styleClass == value)
return;
- if (styleClass != null && classStyles != null)
+ if (styleClass != null && classStyleProperties != null)
foreach (var classStyleProperty in classStyleProperties)
Target.RemoveDynamicResource(classStyleProperty);
/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
if (ve.XamlResources != null)
{
foreach (KeyValuePair<string, object> res in ve.XamlResources.MergedResources)
- if (!resources.ContainsKey(res.Key))
- resources.Add(res.Key, res.Value);
+ {
+ // If a MergedDictionary value is overridden for a DynamicResource,
+ // it comes out later in the enumeration of MergedResources
+ // TryGetValue ensures we pull the up-to-date value for the key
+ if (!resources.ContainsKey(res.Key) && ve.XamlResources.TryGetValue(res.Key, out object value))
+ resources.Add(res.Key, value);
+ }
}
}
[SuppressMessage("Microsoft.Design", "CA1724: Type names should not match namespaces")]
[SuppressMessage("Microsoft.Design", "CA1001:Types that own disposable fields should be disposable", Justification = "This is a singleton class and is not disposed")]
[EditorBrowsable(EditorBrowsableState.Never)]
- public class Accessibility
+ public static class Accessibility
{
- #region Constructor, Destructor, Dispose
- private Accessibility()
- {
- dummy = new View();
- dummy.Name = "dali-atspi-singleton";
- }
-
+ #region Constructor
+ [SuppressMessage("Microsoft.Performance", "CA1810: Initialize reference type static fields inline", Justification = "Need to call native code")]
static Accessibility()
{
enabledSignalHandler = () =>
Interop.Accessibility.RegisterEnabledDisabledSignalHandler(enabledSignalHandler, disabledSignalHandler);
}
-
- /// <summary>
- /// destructor. This is HiddenAPI. recommended not to use in public.
- /// </summary>
- ~Accessibility()
- {
- Interop.Accessibility.RegisterEnabledDisabledSignalHandler(null, null);
-
- Tizen.Log.Debug("NUI", $"Accessibility is destroyed\n");
- }
- #endregion Constructor, Destructor, Dispose
-
+ #endregion Constructor
#region Property
/// <summary>
- /// Instance for singleton
- /// </summary>
- // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
- [EditorBrowsable(EditorBrowsableState.Never)]
- public static Accessibility Instance
- {
- get => accessibility;
- }
-
- /// <summary>
/// Flag to check whether the state of Accessibility is enabled or not.
/// </summary>
/// <remarks>
#endregion Property
-
#region Method
/// <summary>
- /// Get the current status
- /// </summary>
- /// <returns>Current enabled status</returns>
- // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
- [EditorBrowsable(EditorBrowsableState.Never)]
- static public bool GetStatus()
- {
- return true;
- }
-
- /// <summary>
/// Start to speak
/// </summary>
/// <param name="sentence">Content to be spoken</param>
/// <returns></returns>
// This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
[EditorBrowsable(EditorBrowsableState.Never)]
- public bool Say(string sentence, bool discardable)
+ public static bool Say(string sentence, bool discardable)
{
- IntPtr callbackIntPtr = IntPtr.Zero;
- if (sayFinishedEventHandler != null)
- {
- callback = SayFinishedEventCallback;
- callbackIntPtr = Marshal.GetFunctionPointerForDelegate<Delegate>(callback);
- }
- bool ret = Interop.Accessibility.Say(View.getCPtr(dummy), sentence, discardable, callbackIntPtr);
+ bool ret = Interop.Accessibility.Say(sentence, discardable, Marshal.GetFunctionPointerForDelegate<Delegate>(callback));
+
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
/// <param name="pause">true to be paused, false to be resumed</param>
// This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
[EditorBrowsable(EditorBrowsableState.Never)]
- public void PauseResume(bool pause)
+ public static void PauseResume(bool pause)
{
- Interop.Accessibility.PauseResume(View.getCPtr(dummy), pause);
+ Interop.Accessibility.PauseResume(pause);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
/// <param name="alsoNonDiscardable">whether to cancel non-discardable readings as well</param>
// This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
[EditorBrowsable(EditorBrowsableState.Never)]
- public void StopReading(bool alsoNonDiscardable)
+ public static void StopReading(bool alsoNonDiscardable)
{
- Interop.Accessibility.StopReading(View.getCPtr(dummy), alsoNonDiscardable);
+ Interop.Accessibility.StopReading(alsoNonDiscardable);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
/// <param name="suppress">whether to suppress reading of screen-reader</param>
// This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
[EditorBrowsable(EditorBrowsableState.Never)]
- public bool SuppressScreenReader(bool suppress)
+ public static bool SuppressScreenReader(bool suppress)
{
- bool ret = Interop.Accessibility.SuppressScreenReader(View.getCPtr(dummy), suppress);
+ bool ret = Interop.Accessibility.SuppressScreenReader(suppress);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
/// </summary>
// This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
[EditorBrowsable(EditorBrowsableState.Never)]
- public View GetHighlightFrameView()
+ public static View GetHighlightFrameView()
{
var ptr = Interop.ControlDevel.DaliAccessibilityAccessibleGetHighlightActor();
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
/// </summary>
// This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
[EditorBrowsable(EditorBrowsableState.Never)]
- public void SetHighlightFrameView(View view)
+ public static void SetHighlightFrameView(View view)
{
Interop.ControlDevel.DaliAccessibilityAccessibleSetHighlightActor(View.getCPtr(view));
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
/// </summary>
// This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
[EditorBrowsable(EditorBrowsableState.Never)]
- public View GetCurrentlyHighlightedView()
+ public static View GetCurrentlyHighlightedView()
{
var ptr = Interop.ControlDevel.DaliAccessibilityAccessibleGetCurrentlyHighlightedActor();
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- return this.GetInstanceSafely<View>(ptr);
+ return dummyHandle.GetInstanceSafely<View>(ptr);
}
/// <summary>
/// </summary>
// This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
[EditorBrowsable(EditorBrowsableState.Never)]
- public bool ClearCurrentlyHighlightedView()
+ public static bool ClearCurrentlyHighlightedView()
{
var view = GetCurrentlyHighlightedView();
/// </summary>
// This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
[EditorBrowsable(EditorBrowsableState.Never)]
- public event EventHandler<SayFinishedEventArgs> SayFinished
- {
- add => sayFinishedEventHandler += value;
- remove => sayFinishedEventHandler -= value;
- }
+ public static event EventHandler<SayFinishedEventArgs> SayFinished;
/// <summary>
/// Triggered whenever the value of IsEnabled would change from false to true
#endregion Event, Enum, Struct, ETC
-
- #region Internal
- internal void PauseResume(View target, bool pause)
- {
- Interop.Accessibility.PauseResume(View.getCPtr(target), pause);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- }
-
- internal bool Say(View target, string sentence, bool discardable)
- {
- IntPtr callbackIntPtr = IntPtr.Zero;
- if (sayFinishedEventHandler != null)
- {
- callback = SayFinishedEventCallback;
- callbackIntPtr = Marshal.GetFunctionPointerForDelegate<Delegate>(callback);
- }
- bool ret = Interop.Accessibility.Say(View.getCPtr(target), sentence, discardable, callbackIntPtr);
- if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
- return ret;
- }
- #endregion Internal
-
-
#region Private
- private static readonly Accessibility accessibility = new Accessibility();
-
- private event EventHandler<SayFinishedEventArgs> sayFinishedEventHandler;
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
private delegate void SayFinishedEventCallbackType(int result);
- private SayFinishedEventCallbackType callback = null;
+ private static SayFinishedEventCallbackType callback = SayFinishedEventCallback;
private static Interop.Accessibility.EnabledDisabledSignalHandler enabledSignalHandler = null;
private static Interop.Accessibility.EnabledDisabledSignalHandler disabledSignalHandler = null;
- private void SayFinishedEventCallback(int result)
+ private static void SayFinishedEventCallback(int result)
{
NUILog.Debug($"sayFinishedEventCallback(res={result}) called!");
- sayFinishedEventHandler?.Invoke(this, new SayFinishedEventArgs(result));
+ SayFinished?.Invoke(typeof(Accessibility), new SayFinishedEventArgs(result));
}
- private View dummy;
+ private static BaseHandle dummyHandle = new BaseHandle();
#endregion Private
}
/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
}
}
- /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
- [EditorBrowsable(EditorBrowsableState.Never)]
- public bool IsResourcesCreated
- {
- get
- {
- return Application.Current.IsResourcesCreated;
- }
- }
-
- /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
- [EditorBrowsable(EditorBrowsableState.Never)]
- public ResourceDictionary XamlResources
- {
- get
- {
- return Application.Current.XamlResources;
- }
- set
- {
- Application.Current.XamlResources = value;
- }
- }
-
/// <summary>
/// The StyleName, type string.
/// The value indicates DALi style name defined in json theme file.
}
}
- [EditorBrowsable(EditorBrowsableState.Never)]
- public XamlStyle XamlStyle
- {
- get
- {
- return (XamlStyle)GetValue(XamlStyleProperty);
- }
- set
- {
- SetValue(XamlStyleProperty, value);
- }
- }
-
/// <summary>
/// The Color of View. This is an RGBA value.
/// </summary>
{
get
{
- return (this == Accessibility.Accessibility.Instance.GetCurrentlyHighlightedView());
+ return (this == Accessibility.Accessibility.GetCurrentlyHighlightedView());
}
}
[EditorBrowsable(EditorBrowsableState.Never)]
public void SetAccessibilityConstructor(Role role, AccessibilityInterface accessibilityInterface = AccessibilityInterface.None)
{
- Interop.ControlDevel.DaliToolkitDevelControlSetAccessibilityConstructor(SwigCPtr, (int)role, (int)accessibilityInterface);
+ // We have to store the interface flags until we remove SetAccessibilityConstructor and switch to native C# interfaces
+ AtspiInterfaceFlags = (1U << (int)accessibilityInterface);
+ Interop.ControlDevel.DaliToolkitDevelControlSetAccessibilityConstructor(SwigCPtr, (int)role);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
/// <summary>
/// Accessibility interface.
/// </summary>
+ // Values are from Dali::Accessibility::AtspiInterface
[EditorBrowsable(EditorBrowsableState.Never)]
public enum AccessibilityInterface
{
/// Accessibility interface which can store numeric value
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
- Value = 1,
+ Value = 26,
/// <summary>
/// Accessibility interface which can store editable texts
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
- EditableText = 2,
+ EditableText = 9,
/// <summary>
/// Accessibility interface which can store a set of selected items
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
- Selection = 3,
+ Selection = 21,
}
/// <summary>
{
private static AccessibilityStates AccessibilityInitialStates = new AccessibilityStates();
+ // To be removed when native C# AT-SPI interfaces are implemented.
+ private uint? AtspiInterfaceFlags = null;
+
private static void RegisterAccessibilityDelegate()
{
InitializeAccessibilityDelegateAccessibleInterface();
ad.CalculateStates = AccessibilityCalculateStatesWrapper;
ad.GetDescription = AccessibilityGetDescriptionWrapper;
+ ad.GetInterfaces = AccessibilityGetInterfaces; // Not a wrapper, entirely private implementation
ad.GetName = AccessibilityGetNameWrapper;
}
return DuplicateString(description);
}
+ private static uint AccessibilityGetInterfaces(IntPtr self)
+ {
+ // Currently a maximum of one AccessibilityInterface per View is supported.
+ // This will change when we implement AT-SPI interfaces as native C# interfaces.
+ // Then, this method will look like:
+ //
+ // uint flags = 0U;
+ // if (view is IAtspiSelection) flags |= (1U << (int)AccessibilityInterface.Selection)
+ // if (view is IAtspiValue) flags |= (1U << (int)AccessibilityInterface.Value)
+ // ...
+ // return flags;
+
+ View view = GetViewFromRefObject(self);
+
+ if (!view.AtspiInterfaceFlags.HasValue)
+ {
+ NUILog.Error("AtspiInterfaceFlags are not set!");
+ return 0U;
+ }
+
+ return view.AtspiInterfaceFlags.Value;
+ }
+
private static IntPtr AccessibilityGetNameWrapper(IntPtr self)
{
string name = GetViewFromRefObject(self).AccessibilityGetName();
});
/// <summary>
- /// XamlStyleProperty
- /// </summary>
- [EditorBrowsable(EditorBrowsableState.Never)]
- public static readonly BindableProperty XamlStyleProperty = BindableProperty.Create(nameof(XamlStyle), typeof(XamlStyle), typeof(View), default(XamlStyle), propertyChanged: (bindable, oldvalue, newvalue) => ((View)bindable).MergedStyle.Style = (XamlStyle)newvalue);
-
- /// <summary>
/// EnableControlState property
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+/*
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
using System;
-using System.Collections.Generic;
using System.ComponentModel;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-using Tizen.NUI.Binding;
namespace Tizen.NUI.BaseComponents
{
/// <since_tizen> 3 </since_tizen>
public partial class View
{
- private MergedStyle mergedStyle = null;
internal string styleName;
- internal MergedStyle MergedStyle
- {
- get
- {
- if (null == mergedStyle)
- {
- mergedStyle = new MergedStyle(GetType(), this);
- }
-
- return mergedStyle;
- }
- }
internal virtual LayoutItem CreateDefaultLayout()
{
return new AbsoluteLayout();
child.InternalParent = null;
LayoutCount -= child.LayoutCount;
- RemoveChildBindableObject(child);
-
+ OnChildRemoved(child);
if (ChildRemoved != null)
{
ChildRemovedEventArgs e = new ChildRemovedEventArgs
-/*
- * Copyright(c) 2020 Samsung Electronics Co., Ltd.
+/*
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
if (NDalicPINVOKE.SWIGPendingException.Pending)
throw NDalicPINVOKE.SWIGPendingException.Retrieve();
Children.Add(child);
+ OnChildAdded(child);
if (ChildAdded != null)
{
};
ChildAdded(this, e);
}
-
- AddChildBindableObject(child);
}
}
/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
}
disposed = true;
-
- if (null != Application.Current)
- {
- Application.Current.XamlResourceChanged -= OnResourcesChanged;
- }
DebugFileLogging.Instance.WriteLog($"BaseHandle.Dispose({type}) END");
DebugFileLogging.Instance.WriteLog($"=============================");
NUILog.Debug($"BaseHandle.Dispose({type}) END");
/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
using System.Collections.Generic;
using System.ComponentModel;
using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Binding;
using Tizen.NUI.Binding.Internals;
namespace Tizen.NUI
/// added to them.
/// </summary>
/// <since_tizen> 4 </since_tizen>
- public abstract class Container : Animatable
+ public abstract class Container : Animatable, IResourcesProvider
{
+ /// <summary> XamlStyleProperty </summary>
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public static readonly BindableProperty XamlStyleProperty = BindableProperty.Create(nameof(XamlStyle), typeof(XamlStyle), typeof(Container), default(XamlStyle), propertyChanged: (bindable, oldvalue, newvalue) => ((View)bindable).MergedStyle.Style = (XamlStyle)newvalue);
+
internal BaseHandle InternalParent;
private List<View> childViews = new List<View>();
+ private MergedStyle mergedStyle = null;
+ ResourceDictionary _resources;
+ bool IResourcesProvider.IsResourcesCreated => _resources != null;
internal Container(global::System.IntPtr cPtr, bool cMemoryOwn) : base(cPtr, cMemoryOwn)
{
// No un-managed data hence no need to store a native ptr
}
+ /// This will be public opened in tizen_next after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public ResourceDictionary XamlResources
+ {
+ get
+ {
+ if (_resources != null)
+ return _resources;
+ _resources = new ResourceDictionary();
+ ((IResourceDictionary)_resources).ValuesChanged += OnResourcesChanged;
+ return _resources;
+ }
+ set
+ {
+ if (_resources == value)
+ return;
+ OnPropertyChanging();
+ if (_resources != null)
+ ((IResourceDictionary)_resources).ValuesChanged -= OnResourcesChanged;
+ _resources = value;
+ OnResourcesChanged(value);
+ if (_resources != null)
+ ((IResourceDictionary)_resources).ValuesChanged += OnResourcesChanged;
+ OnPropertyChanged();
+ }
+ }
+
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public XamlStyle XamlStyle
+ {
+ get
+ {
+ return (XamlStyle)GetValue(XamlStyleProperty);
+ }
+ set
+ {
+ SetValue(XamlStyleProperty, value);
+ }
+ }
+
+ internal MergedStyle MergedStyle
+ {
+ get
+ {
+ if (null == mergedStyle)
+ {
+ mergedStyle = new MergedStyle(GetType(), this);
+ }
+
+ return mergedStyle;
+ }
+ }
+
/// <summary>
/// List of children of Container.
/// </summary>
internal abstract View FindCurrentChildById(uint id);
+ internal override void OnParentResourcesChanged(IEnumerable<KeyValuePair<string, object>> values)
+ {
+ if (values == null)
+ return;
+
+ if (!((IResourcesProvider)this).IsResourcesCreated || XamlResources.Count == 0)
+ {
+ base.OnParentResourcesChanged(values);
+ return;
+ }
+
+ var innerKeys = new HashSet<string>();
+ var changedResources = new List<KeyValuePair<string, object>>();
+ foreach (KeyValuePair<string, object> c in XamlResources)
+ innerKeys.Add(c.Key);
+ foreach (KeyValuePair<string, object> value in values)
+ {
+ if (innerKeys.Add(value.Key))
+ changedResources.Add(value);
+ }
+ if (changedResources.Count != 0)
+ OnResourcesChanged(changedResources);
+ }
+
+ /// <summary>
+ /// Invoked whenever the binding context of the element changes. Implement this method to add class handling for this event.
+ /// </summary>
+ /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ protected override void OnBindingContextChanged()
+ {
+ var gotBindingContext = false;
+ object bc = null;
+
+ for (var index = 0; index < Children.Count; index++)
+ {
+ Element child = Children[index];
+
+ if (!gotBindingContext)
+ {
+ bc = BindingContext;
+ gotBindingContext = true;
+ }
+
+ SetChildInheritedBindingContext(child, bc);
+ }
+ base.OnBindingContextChanged();
+ }
+
private void DisposeIncludeChildren()
{
foreach (var child in Children)
using System;
using Tizen.NUI.BaseComponents;
using System.ComponentModel;
-using Tizen.NUI.Binding;
namespace Tizen.NUI
{
public class Layer : Container
{
private Window window;
-
private int layoutCount = 0;
/// <summary>
}
}
- /// This will be public opened in tizen_next after ACR done. Before ACR, need to be hidden as inhouse API.
- [EditorBrowsable(EditorBrowsableState.Never)]
- public ResourceDictionary XamlResources
- {
- get
- {
- return Application.Current.XamlResources;
- }
- set
- {
- Application.Current.XamlResources = value;
- }
- }
-
/// <summary>
/// Gets the Layer's ID
/// Readonly
if (NDalicPINVOKE.SWIGPendingException.Pending)
throw NDalicPINVOKE.SWIGPendingException.Retrieve();
Children.Add(child);
- BindableObject.SetInheritedBindingContext(child, this?.BindingContext);
+ OnChildAdded(child);
}
}
Children.Remove(child);
child.InternalParent = null;
-
+ OnChildRemoved(child);
LayoutCount -= child.LayoutCount;
}
/// <summary>
/// Returns the total number of points in this TouchData.
+ /// Point means the touched point.
+ /// If there is one touch point, the point index is 0.
+ /// If there are two touch points, the point index has 0 and 1.
/// </summary>
/// <returns>The total number of points.</returns>
/// <since_tizen> 3 </since_tizen>
/// point. This is returned by this method.<br />
/// If a point is greater than GetPointCount(), then this method will return -1.<br />
/// </summary>
- /// <param name="point">The point required.</param>
+ /// <param name="point">The index of a touch point</param>
/// <returns>The device ID of this point.</returns>
/// <since_tizen> 3 </since_tizen>
public int GetDeviceId(uint point)
/// Retrieves the state of the point specified.<br />
/// If a point is greater than GetPointCount(), then this method will return PointState.Finished.<br />
/// </summary>
- /// <param name="point">The point required.</param>
+ /// <param name="point">The index of a touch point.</param>
/// <returns>The state of the point specified.</returns>
/// <since_tizen> 3 </since_tizen>
public PointStateType GetState(uint point)
}
/// <summary>
- /// Retrieves the actor that was underneath the point specified.<br />
+ /// Retrieves the view that was underneath the point specified.<br />
/// If a point is greater than GetPointCount(), then this method will return an empty handle.<br />
/// </summary>
- /// <param name="point">The point required.</param>
- /// <returns>The actor that was underneath the point specified.</returns>
+ /// <param name="point">The index of a touch point.</param>
+ /// <returns>The view that was underneath the point specified.</returns>
/// <since_tizen> 3 </since_tizen>
public View GetHitView(uint point)
{
}
/// <summary>
- /// Retrieves the coordinates relative to the top-left of the hit actor at the point specified.<br />
- /// The top-left of an actor is (0.0, 0.0, 0.5).<br />
- /// If you require the local coordinates of another actor (for example, the parent of the hit actor),
- /// then you should use Actor::ScreenToLocal().<br />
+ /// Retrieves the coordinates relative to the top-left of the hit view at the point specified.<br />
+ /// The top-left of an view is (0.0, 0.0, 0.5).<br />
+ /// If you require the local coordinates of another view (for example, the parent of the hit view),
+ /// then you should use ScreenToLocal().<br />
/// If a point is greater than GetPointCount(), then this method will return Vector2.Zero.<br />
/// </summary>
- /// <param name="point">The point required.</param>
- /// <returns>The coordinates relative to the top-left of the hit actor of the point specified.</returns>
+ /// <param name="point">The index of a touch point.</param>
+ /// <returns>The coordinates relative to the top-left of the hit view of the point specified.</returns>
/// <since_tizen> 3 </since_tizen>
public Vector2 GetLocalPosition(uint point)
{
/// Retrieves the coordinates relative to the top-left of the screen of the point specified.<br />
/// If a point is greater than GetPointCount(), then this method will return Vector2.Zero.<br />
/// </summary>
- /// <param name="point">The point required.</param>
+ /// <param name="point">The index of a touch point.</param>
/// <returns>The coordinates relative to the top-left of the screen of the point specified.</returns>
/// <since_tizen> 3 </since_tizen>
public Vector2 GetScreenPosition(uint point)
/// This is the average of both the horizontal and vertical radii of the press point.<br />
/// If point is greater than GetPointCount(), then this method will return 0.0f.<br />
/// </summary>
- /// <param name="point">The point required.</param>
+ /// <param name="point">The index of a touch point.</param>
/// <returns>The radius of the press point.</returns>
/// <since_tizen> 3 </since_tizen>
public float GetRadius(uint point)
/// Retrieves both the horizontal and the vertical radii of the press point.<br />
/// If a point is greater than GetPointCount(), then this method will return Vector2.Zero.<br />
/// </summary>
- /// <param name="point">The point required.</param>
+ /// <param name="point">The index of a touch point.</param>
/// <returns>The horizontal and vertical radii of the press point.</returns>
/// <since_tizen> 3 </since_tizen>
public Vector2 GetEllipseRadius(uint point)
/// A value greater than 1.0f means more pressure than normal has been applied.<br />
/// If point is greater than GetPointCount(), then this method will return 1.0f.<br />
/// </summary>
- /// <param name="point">The point required.</param>
+ /// <param name="point">The index of a touch point.</param>
/// <returns>The touch pressure.</returns>
/// <since_tizen> 3 </since_tizen>
public float GetPressure(uint point)
/// <summary>
/// Get mouse device's button value (for example, right or left button)
/// </summary>
- /// <param name="point">The point required.</param>
+ /// <param name="point">The index of a touch point.</param>
/// <returns></returns>
/// <since_tizen> 5 </since_tizen>
/// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
using System;
using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
using System.Runtime.CompilerServices;
namespace Tizen.NUI.Xaml
{
/// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
[EditorBrowsable(EditorBrowsableState.Never)]
- public XamlFilePathAttribute([CallerFilePath] string filePath = "")
- {
- // Unused parameter
- _ = filePath;
- }
+ public XamlFilePathAttribute([CallerFilePath] string filePath = "") => FilePath = filePath;
+
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ public string FilePath { get; }
+
+ internal static string GetFilePathForObject(object view) => (view?.GetType().GetTypeInfo().GetCustomAttributes(typeof(XamlFilePathAttribute), false).FirstOrDefault() as XamlFilePathAttribute)?.FilePath;
}
}
/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
XmlInfo = xmlInfo;
}
+ internal XamlParseException(string message, IServiceProvider serviceProvider, Exception innerException = null)
+ : this(message, GetLineInfo(serviceProvider), innerException)
+ {
+ }
+
/// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
[EditorBrowsable(EditorBrowsableState.Never)]
public IXmlLineInfo XmlInfo { get; private set; }
return message;
return string.Format("Position {0}:{1}. {2}", xmlinfo.LineNumber, xmlinfo.LinePosition, message);
}
+
+
+ static IXmlLineInfo GetLineInfo(IServiceProvider serviceProvider)
+ => (serviceProvider.GetService(typeof(IXmlLineInfoProvider)) is IXmlLineInfoProvider lineInfoProvider) ? lineInfoProvider.XmlLineInfo : new XmlLineInfo();
}
}
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+/*
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
public static readonly BindableProperty BindingContextProperty =
- BindableProperty.Create(nameof(BindingContext), typeof(object), typeof(BindableObject), null, propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) =>
- {
- var bindableObject = (BindableObject)bindable;
- if (newValue != null)
- {
- bindableObject.bindingContext = newValue;
- bindableObject.FlushBinding();
-
- if (newValue is BindableObject targetBindableObject)
- {
- targetBindableObject.IsBinded = true;
- }
- }
- }),
- defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
- {
- if (null != bindable.bindingContext)
- {
- return bindable.bindingContext;
- }
-
- if (bindable is Container container)
- {
- return container.Parent?.BindingContext;
- }
- else
- {
- return null;
- }
- }));
+ BindableProperty.Create(nameof(BindingContext), typeof(object), typeof(BindableObject), default(object), BindingMode.OneWay, null, BindingContextPropertyChanged,
+ null, null, BindingContextPropertyBindingChanging);
readonly Dictionary<BindableProperty, BindablePropertyContext> properties = new Dictionary<BindableProperty, BindablePropertyContext>(4);
set;
} = false;
+ static void BindingContextPropertyChanged(BindableObject bindable, object oldvalue, object newvalue)
+ {
+ bindable.inheritedContext = null;
+ bindable.ApplyBindings(skipBindingContext: true, fromBindingContextChanged: true);
+ bindable.OnBindingContextChanged();
+
+ if (newvalue is BindableObject targetBindableObject)
+ {
+ targetBindableObject.IsBinded = true;
+ }
+ }
+
static void BindingContextPropertyBindingChanging(BindableObject bindable, BindingBase oldBindingBase, BindingBase newBindingBase)
{
object context = bindable.inheritedContext;
}
}
- internal void AddChildBindableObject(BindableObject child)
- {
- if (null != child)
- {
- children.Add(child);
- child.FlushBinding();
- }
- }
-
- internal void RemoveChildBindableObject(BindableObject child)
- {
- children.Remove(child);
- }
-
internal void ReplaceBindingElement(Dictionary<string, object> oldNameScope, Dictionary<string, object> newNameScope)
{
var xElementToNameOfOld = new Dictionary<object, string>();
}
}
}
-
- private List<BindableObject> children = new List<BindableObject>();
-
- private void FlushBinding()
- {
- ApplyBindings(skipBindingContext: true, fromBindingContextChanged: true);
- OnBindingContextChanged();
-
- foreach (var child in children)
- {
- child.FlushBinding();
- }
- }
}
}
/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
internal virtual void OnParentResourcesChanged(object sender, ResourcesChangedEventArgs e)
{
- // if (e == ResourcesChangedEventArgs.StyleSheets)
- // // ApplyStyleSheetsOnParentSet();
- // else
- // OnParentResourcesChanged(e.Values);
+ OnParentResourcesChanged(e.Values);
}
internal virtual void OnParentResourcesChanged(IEnumerable<KeyValuePair<string, object>> values)
object value;
if (this.TryGetResource(key, out value))
OnResourceChanged(property, value);
-
- if (null != Application.Current)
- {
- Application.Current.XamlResourceChanged += OnResourcesChanged;
- }
}
internal event EventHandler ParentSet;
-/*
+/*
* Copyright(c) 2021 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2022 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
-
-using Tizen.NUI.Binding.Internals;
using Tizen.NUI.Xaml;
namespace Tizen.NUI.Binding
using System.Reflection;
using Tizen.NUI.StyleSheets;
using System.ComponentModel;
+using Tizen.NUI.BaseComponents;
namespace Tizen.NUI.Binding
{
{
internal const string StyleClassPrefix = "Tizen.NUI.Binding.StyleClass.";
+ const int CleanupTrigger = 128;
+ int cleanupThreshold = CleanupTrigger;
+
readonly BindableProperty basedOnResourceProperty = BindableProperty.CreateAttached("BasedOnResource", typeof(XamlStyle), typeof(XamlStyle), default(XamlStyle),
propertyChanged: OnBasedOnResourceChanged);
if (BaseResourceKey != null)
bindable.SetDynamicResource(basedOnResourceProperty, BaseResourceKey);
ApplyCore(bindable, BasedOn ?? GetBasedOnResource(bindable));
+ CleanUpWeakReferences();
}
[EditorBrowsable(EditorBrowsableState.Never)]
static void OnBasedOnResourceChanged(BindableObject bindable, object oldValue, object newValue)
{
- // Style style = (bindable as BaseHandle).Style;
- // if (style == null)
- // return;
- // style.UnApplyCore(bindable, (Style)oldValue);
- // style.ApplyCore(bindable, (Style)newValue);
+ XamlStyle style = (bindable as View).XamlStyle;
+ if (style == null)
+ return;
+ style.UnApplyCore(bindable, (XamlStyle)oldValue);
+ style.ApplyCore(bindable, (XamlStyle)newValue);
}
void UnApplyCore(BindableObject bindable, XamlStyle basedOn)
return true;
return value.TargetType.IsAssignableFrom(TargetType);
}
- }
+
+ void CleanUpWeakReferences()
+ {
+ if (targets.Count < cleanupThreshold)
+ {
+ return;
+ }
+
+ targets.RemoveAll(t => !t.TryGetTarget(out _));
+ cleanupThreshold = targets.Count + CleanupTrigger;
+ }
+ }
}
//var accessbilityStatus = NDalicPINVOKE.accessibility_get_status(View.getCPtr(view));
if (e.Key.KeyPressedName == "Return")
{
- Accessibility.Instance.SayFinished -= Instance_SayFinished;
- Accessibility.Instance.Say("", true);
+ Accessibility.SayFinished -= Instance_SayFinished;
+ Accessibility.Say("", true);
repeatFlag = false;
}
else if (e.Key.KeyPressedName == "Right")
{
- Accessibility.Instance.Say(testScript1, true);
+ Accessibility.Say(testScript1, true);
}
else if (e.Key.KeyPressedName == "Left")
{
- Accessibility.Instance.Say(testScript2, true);
+ Accessibility.Say(testScript2, true);
}
else if (e.Key.KeyPressedName == "Up")
{
- Accessibility.Instance.Say(testScript3, true);
+ Accessibility.Say(testScript3, true);
}
else if (e.Key.KeyPressedName == "Down")
{
repeatFlag = true;
- Accessibility.Instance.SayFinished += Instance_SayFinished;
- Accessibility.Instance.Say("my name is say api !!!", true);
+ Accessibility.SayFinished += Instance_SayFinished;
+ Accessibility.Say("my name is say api !!!", true);
}
else if (e.Key.KeyPressedName == "1")
{
- Accessibility.Instance.PauseResume(true);
+ Accessibility.PauseResume(true);
}
else if (e.Key.KeyPressedName == "2")
{
- Accessibility.Instance.PauseResume(false);
+ Accessibility.PauseResume(false);
}
}
return false;
tlog.Fatal(tag, $"Instance_SayFinished()! State={e.State}");
if (e.State == Accessibility.SayFinishedState.Stopped)
{
- Accessibility.Instance.Say("ÀÌ°Ç Äݹé Å×½ºÆ® ÀÔ´Ï´Ù. this is callback test! ÄݹéÀ» »©·Á¸é È®ÀÎÅ°¸¦ ´©¸£¼¼¿ä. to remove callback please push Return key", true);
+ Accessibility.Say("ÀÌ°Ç Äݹé Å×½ºÆ® ÀÔ´Ï´Ù. this is callback test! ÄݹéÀ» »©·Á¸é È®ÀÎÅ°¸¦ ´©¸£¼¼¿ä. to remove callback please push Return key", true);
}
}
[Test]
[Category("P1")]
- [Description("Accessibility constructor.")]
- [Property("SPEC", "Tizen.NUI.Accessibility.Accessibility C")]
- [Property("SPEC_URL", "-")]
- [Property("CRITERIA", "CONSTR")]
- [Property("AUTHOR", "guowei.wang@samsung.com")]
- public void AccessibilityConstructor()
- {
- tlog.Debug(tag, $"AccessibilityConstructor START");
-
- var testingTarget = Accessibility.Accessibility.Instance; ;
- Assert.IsNotNull(testingTarget, "Can't create success object Accessibility");
- Assert.IsInstanceOf<Accessibility.Accessibility>(testingTarget, "Should be an instance of Accessibility type.");
-
- tlog.Debug(tag, $"AccessibilityConstructor END (OK)");
- }
-
- [Test]
- [Category("P1")]
[Description("Accessibility GetStatus.")]
[Property("SPEC", "Tizen.NUI.Accessibility.GetStatus M")]
[Property("SPEC_URL", "-")]
{
tlog.Debug(tag, $"AccessibilitySay START");
- var testingTarget = Accessibility.Accessibility.Instance; ;
- Assert.IsNotNull(testingTarget, "Can't create success object Accessibility");
- Assert.IsInstanceOf<Accessibility.Accessibility>(testingTarget, "Should be an instance of Accessibility type.");
-
- var result = testingTarget.Say("Hi,Bixby! Please help to order a sandwich.", true);
+ var result = Accessibility.Accessibility.Say("Hi,Bixby! Please help to order a sandwich.", true);
tlog.Debug(tag, "Status : " + result);
tlog.Debug(tag, $"AccessibilitySay END (OK)");
{
tlog.Debug(tag, $"AccessibilityPauseResume START");
- var testingTarget = Accessibility.Accessibility.Instance; ;
- Assert.IsNotNull(testingTarget, "Can't create success object Accessibility");
- Assert.IsInstanceOf<Accessibility.Accessibility>(testingTarget, "Should be an instance of Accessibility type.");
-
try
{
- testingTarget.PauseResume(true);
+ Accessibility.Accessibility.PauseResume(true);
}
catch (Exception e)
{
{
tlog.Debug(tag, $"AccessibilityStopReading START");
- var testingTarget = Accessibility.Accessibility.Instance; ;
- Assert.IsNotNull(testingTarget, "Can't create success object Accessibility");
- Assert.IsInstanceOf<Accessibility.Accessibility>(testingTarget, "Should be an instance of Accessibility type.");
-
try
{
- testingTarget.StopReading(true);
+ Accessibility.Accessibility.StopReading(true);
}
catch (Exception e)
{
{
tlog.Debug(tag, $"AccessibilitySuppressScreenReader START");
- var testingTarget = Accessibility.Accessibility.Instance; ;
- Assert.IsNotNull(testingTarget, "Can't create success object Accessibility");
- Assert.IsInstanceOf<Accessibility.Accessibility>(testingTarget, "Should be an instance of Accessibility type.");
-
try
{
- testingTarget.SuppressScreenReader(false);
+ Accessibility.Accessibility.SuppressScreenReader(false);
}
catch (Exception e)
{
{
tlog.Debug(tag, $"AccessibilitySetHighlightFrameView START");
- var testingTarget = Accessibility.Accessibility.Instance; ;
- Assert.IsNotNull(testingTarget, "Can't create success object Accessibility");
- Assert.IsInstanceOf<Accessibility.Accessibility>(testingTarget, "Should be an instance of Accessibility type.");
-
using (View view = new View())
{
view.Size = new Size(100, 50);
try
{
- testingTarget.SetHighlightFrameView(view);
+ Accessibility.Accessibility.SetHighlightFrameView(view);
- var result = testingTarget.GetHighlightFrameView();
+ var result = Accessibility.Accessibility.GetHighlightFrameView();
tlog.Debug(tag, "HighlightFrameView : " + result);
- tlog.Debug(tag, "ClearCurrentlyHighlightedView : " + testingTarget.ClearCurrentlyHighlightedView());
+ tlog.Debug(tag, "ClearCurrentlyHighlightedView : " + Accessibility.Accessibility.ClearCurrentlyHighlightedView());
}
catch (Exception e)
{
{
tlog.Debug(tag, $"AccessibilitySayFinished START");
- var testingTarget = Accessibility.Accessibility.Instance;
- Assert.IsNotNull(testingTarget, "Can't create success object Accessibility");
- Assert.IsInstanceOf<Accessibility.Accessibility>(testingTarget, "Should be an instance of Accessibility type.");
-
- testingTarget.SayFinished += OnSayFinished;
- testingTarget.SayFinished -= OnSayFinished;
+ Accessibility.Accessibility.SayFinished += OnSayFinished;
+ Accessibility.Accessibility.SayFinished -= OnSayFinished;
tlog.Debug(tag, $"AccessibilitySayFinished END (OK)");
}
projects / platform / core / csapi / tizenfx.git / commitdiff