From 9d8a8e9a2a2add7c8a3befb2571397c762e086ed Mon Sep 17 00:00:00 2001 From: =?utf8?q?Artur=20=C5=9Awigo=C5=84?= Date: Fri, 28 Jan 2022 15:57:57 +0100 Subject: [PATCH] [AT-SPI] Remove SetAccessibilityConstructor() A related dali-toolkit patch removes this function. Since the default ControlAccessible is used, is is sufficient to only set the role. Change-Id: I9c6010ccf277d24baa26e0f24433d72efdcb71ab --- .../internal/widget_view/widget_view_impl.cpp | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp index 691c8dc..041051b 100644 --- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp +++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp @@ -942,6 +942,7 @@ Dali::WidgetView::WidgetView::WidgetViewSignalType& WidgetView::WidgetTerminated void WidgetView::OnInitialize() { + auto self = Self(); char* instanceId = NULL; char* previewPath = NULL; std::string previewImage; @@ -1004,10 +1005,10 @@ void WidgetView::OnInitialize() mPreviewImage.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); mPreviewImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - Self().SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); - Self().SetProperty( Actor::Property::SIZE, Vector2(mWidth, mHeight)); + self.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); + self.SetProperty( Actor::Property::SIZE, Vector2(mWidth, mHeight)); - Self().Add( mPreviewActor ); + self.Add( mPreviewActor ); mPreviewActor.Add( mPreviewImage ); mStateTextActor = Dali::Actor::New(); @@ -1043,16 +1044,12 @@ void WidgetView::OnInitialize() // launch widget LaunchWidget(); - Self().TouchedSignal().Connect( this, &WidgetView::OnTouch ); - Self().WheelEventSignal().Connect( this, &WidgetView::OnWheelEvent ); + self.TouchedSignal().Connect( this, &WidgetView::OnTouch ); + self.WheelEventSignal().Connect( this, &WidgetView::OnWheelEvent ); - // Add Accessibility - Toolkit::DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) { - return std::make_unique(actor, Dali::Accessibility::Role::EMBEDDED); - }); - - //Enable highightability - Self().SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true); + // Accessibility + self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::EMBEDDED); + self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true); } void WidgetView::OnSceneConnection( int depth ) -- 2.34.1