Prevent embedding a11y tree if a widget is paused

Change-Id: I71f8b015f6e381da4555d30c56a9712afbd2a9a3

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 c1258cba53106eab1906688979962d8b63c77bae..5799d015108c6debe4e88de82950aaeb24c0014c 100644 (file)
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
@@ -441,6 +441,11 @@ bool WidgetView::PauseWidgetInternally()
      return false;
   }
 
+  if(Dali::Accessibility::IsUp())
+  {
+    GetAccessibleObject()->OnChildrenChanged();
+  }
+
   DALI_LOG_RELEASE_INFO("WidgetView::PauseWidget: Widget is paused (%s, %s) [%p]\n", mWidgetId.c_str(), mInstanceId.c_str(), this );
 
   return true;
@@ -465,6 +470,11 @@ bool WidgetView::ResumeWidgetInternally()
      return false;
   }
 
+  if(Dali::Accessibility::IsUp())
+  {
+    GetAccessibleObject()->OnChildrenChanged();
+  }
+
   DALI_LOG_RELEASE_INFO("WidgetView::ResumeWidget: Widget is resumed (%s, %s) [%p]\n", mWidgetId.c_str(), mInstanceId.c_str(), this );
 
   return true;
@@ -1218,7 +1228,7 @@ void WidgetView::OnUpdateArea( Dali::PropertyNotification& source )
     mPaused = needPaused;
   }
 
-  if(!mPaused)
+  if(!mPaused && Dali::Accessibility::IsUp())
   {
     auto accessible = std::dynamic_pointer_cast<WidgetView::WidgetViewAccessible>(GetAccessibleObject());
     DALI_ASSERT_DEBUG(accessible);
@@ -1807,6 +1817,11 @@ void WidgetView::UpdateBuffer( struct tizen_remote_surface *surface, struct wl_b
   mRemoteSurface = surface;
 }
 
+bool WidgetView::IsPaused() const
+{
+  return mPaused;
+}
+
 bool WidgetView::LaunchWidget()
 {
   screen_connector_toolkit_ops ops;
@@ -2023,6 +2038,12 @@ void WidgetView::WidgetViewAccessible::DoGetChildren(std::vector<Dali::Accessibi
 
   auto        self       = Dali::WidgetView::WidgetView::DownCast(Self());
   auto&       selfImpl   = Dali::WidgetView::GetImplementation(self);
+  if(selfImpl.IsPaused())
+  {
+    DALI_LOG_RELEASE_INFO("Returning no children as the widget is paused.");
+    return;
+  }
+
   const auto& instanceId = selfImpl.GetInstanceId();
   int         pid        = selfImpl.GetPid();
   std::string busName    = Bridge::MakeBusNameForWidget(instanceId, pid);

diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.h b/widget_viewer_dali/internal/widget_view/widget_view_impl.h
index 393dad1e584a519e0c8cdfc3f1f706aa0a662936..f2663bcbcd8c32432ebc633ebaf0329f448986f7 100644 (file)
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.h
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.h
@@ -331,6 +331,8 @@ public: // Internal API
    */
   void UpdateBuffer( struct tizen_remote_surface *surface, struct wl_buffer *buffer, int32_t fd);
 
+  bool IsPaused() const;
+
 public: // Internal API for WidgetViewManager
 
   /**