From: Artur Świgoń Date: Thu, 28 Mar 2024 12:47:58 +0000 (+0100) Subject: [NUI][AT-SPI] Promote ReadingInfoTypes to Container X-Git-Tag: accepted/tizen/7.0/unified/20240418.084455~1^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f39bd9b5108741914f2788ff0bcbfc5939450b18;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [NUI][AT-SPI] Promote ReadingInfoTypes to Container This way both View and Layer can use this API. --- diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs index f002d0a..ce2b034 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs @@ -84,12 +84,12 @@ namespace Tizen.NUI public static extern void DaliToolkitDevelControlClearAccessibilityRelations(HandleRef arg1); [EditorBrowsable(EditorBrowsableState.Never)] - [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_SetAccessibilityReadingInfoType2")] - public static extern void DaliToolkitDevelControlSetAccessibilityReadingInfoTypes(HandleRef arg1, int arg2); + [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Accessibility_SetReadingInfoTypes")] + public static extern void DaliAccessibilitySetReadingInfoTypes(HandleRef arg1, int arg2); [EditorBrowsable(EditorBrowsableState.Never)] - [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_GetAccessibilityReadingInfoType2")] - public static extern int DaliToolkitDevelControlGetAccessibilityReadingInfoTypes(HandleRef arg1); + [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Accessibility_GetReadingInfoTypes")] + public static extern int DaliAccessibilityGetReadingInfoTypes(HandleRef arg1); [EditorBrowsable(EditorBrowsableState.Never)] [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_ClearAccessibilityHighlight")] diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs index e44f6a1..12424fd 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs @@ -198,33 +198,6 @@ namespace Tizen.NUI.BaseComponents } /////////////////////////////////////////////////////////////////// - // ********************* ReadingInfoType *********************** // - /////////////////////////////////////////////////////////////////// - - /// - /// Sets accessibility reading information. - /// - /// Reading information type - [EditorBrowsable(EditorBrowsableState.Never)] - public void SetAccessibilityReadingInfoTypes(AccessibilityReadingInfoTypes type) - { - Interop.ControlDevel.DaliToolkitDevelControlSetAccessibilityReadingInfoTypes(SwigCPtr, (int)type); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Gets accessibility reading information. - /// - /// Reading information type - [EditorBrowsable(EditorBrowsableState.Never)] - public AccessibilityReadingInfoTypes GetAccessibilityReadingInfoTypes() - { - AccessibilityReadingInfoTypes result = (AccessibilityReadingInfoTypes)Interop.ControlDevel.DaliToolkitDevelControlGetAccessibilityReadingInfoTypes(SwigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return result; - } - - /////////////////////////////////////////////////////////////////// // ******************** Accessibility States ******************* // /////////////////////////////////////////////////////////////////// diff --git a/src/Tizen.NUI/src/public/Common/Container.cs b/src/Tizen.NUI/src/public/Common/Container.cs index da75095..5bb920c 100755 --- a/src/Tizen.NUI/src/public/Common/Container.cs +++ b/src/Tizen.NUI/src/public/Common/Container.cs @@ -272,6 +272,29 @@ namespace Tizen.NUI [Obsolete("This has been deprecated in API9 and will be removed in API11. Use ChildCount property instead.")] public abstract UInt32 GetChildCount(); + /// + /// Sets accessibility reading information. + /// + /// Reading information type + [EditorBrowsable(EditorBrowsableState.Never)] + public void SetAccessibilityReadingInfoTypes(AccessibilityReadingInfoTypes type) + { + Interop.ControlDevel.DaliAccessibilitySetReadingInfoTypes(SwigCPtr, (int)type); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Gets accessibility reading information. + /// + /// Reading information type + [EditorBrowsable(EditorBrowsableState.Never)] + public AccessibilityReadingInfoTypes GetAccessibilityReadingInfoTypes() + { + AccessibilityReadingInfoTypes result = (AccessibilityReadingInfoTypes)Interop.ControlDevel.DaliAccessibilityGetReadingInfoTypes(SwigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return result; + } + internal abstract View FindCurrentChildById(uint id); internal override void OnParentResourcesChanged(IEnumerable> values)