X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fmodel3d-view%2Fmodel3d-view-impl.cpp;h=5b4990934cba635b84ffb416228a7f218eec10a2;hp=3830f626a9206099286456296f8e4d6bf4457d54;hb=f546dd5d83a968e573f8f053a01ce43df32c71a0;hpb=67ea1e508cc155651fcb79825ed02f3cad7a6c0e diff --git a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp index 3830f62..5b49909 100644 --- a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp +++ b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -25,12 +25,12 @@ #include #include #include -#include #include #include // INTERNAL INCLUDES #include +#include namespace Dali { @@ -425,7 +425,7 @@ Property::Value Model3dView::GetProperty( BaseObject* object, Property::Index in ///////////////////////////////////////////////////////////// -void Model3dView::OnStageConnection( int depth ) +void Model3dView::OnSceneConnection( int depth ) { CustomActor self = Self(); self.AddRenderer( mRenderer ); @@ -447,7 +447,7 @@ void Model3dView::OnStageConnection( int depth ) constraint.Apply(); } - Control::OnStageConnection( depth ); + Control::OnSceneConnection( depth ); } /////////////////////////////////////////////////////////// @@ -462,6 +462,10 @@ void Model3dView::OnInitialize() Shader shader = Shader::New( SIMPLE_VERTEX_SHADER, SIMPLE_FRAGMENT_SHADER ); mRenderer = Renderer::New( mesh, shader ); + DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) { + return std::unique_ptr< Dali::Accessibility::Accessible >( + new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::IMAGE ) ); + } ); } void Model3dView::LoadGeometry()