From a568f202f0026862dca7d83f927349c94f4c4648 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Artur=20=C5=9Awigo=C5=84?= Date: Fri, 15 Apr 2022 14:47:39 +0200 Subject: [PATCH] [AT-SPI] Set child's parent in WebViewAccessible A related dali-adaptor patch makes ProxyAccessible's parent settable. Change-Id: Ifff884b6b20302617720ca25eedf16bdf275ef0e --- .../utc-Dali-Accessibility-Controls-BridgeUp.cpp | 8 +++++++- dali-toolkit/internal/controls/web-view/web-view-impl.cpp | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp index 9a3ef2b..8364147 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp @@ -1320,7 +1320,13 @@ int UtcDaliWebViewAccessible(void) DALI_TEST_EQUALS(children.size(), 1u, TEST_LOCATION); - auto address = children[0]->GetAddress(); + auto* child = children[0]; + + DALI_TEST_CHECK(child); + DALI_TEST_CHECK(child->IsProxy()); + DALI_TEST_EQUALS(child->GetParent(), webViewAccessible, TEST_LOCATION); + + auto address = child->GetAddress(); DALI_TEST_CHECK(address); DALI_TEST_NOT_EQUALS(address.GetBus(), webViewAccessible->GetAddress().GetBus(), 0.0f, TEST_LOCATION); diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp index 7fc2117..e3f2406 100755 --- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp @@ -1246,6 +1246,8 @@ bool WebView::SetVisibility(bool visible) WebView::WebViewAccessible::WebViewAccessible(Dali::Actor self, Dali::WebEngine& webEngine) : ControlAccessible(self), mRemoteChild{}, mWebEngine{webEngine} { + mRemoteChild.SetParent(this); + Dali::Accessibility::Bridge::EnabledSignal().Connect(this, &WebViewAccessible::OnAccessibilityEnabled); Dali::Accessibility::Bridge::DisabledSignal().Connect(this, &WebViewAccessible::OnAccessibilityDisabled); -- 2.7.4