Visuals are stored in Control after being registered through the new API via the derived control
Change-Id: If94c43f148994434c9f7c409fadef5ebd590e66c
#include "dummy-control.h"
#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
namespace Dali
{
{
}
+void DummyControlImpl::RegisterVisual( Property::Index index, Actor placementActor, Toolkit::Visual::Base visual )
+{
+ Control::RegisterVisual( index, placementActor, visual );
+}
+
+void DummyControlImpl::UnregisterVisual( Property::Index index )
+{
+ Control::UnregisterVisual( index );
+}
+
DummyControl DummyControlImplOverride::New()
{
IntrusivePtr< DummyControlImplOverride > impl = new DummyControlImplOverride;
{
class DummyControlImpl;
-
+class ControlRenderer;
/**
* Control does not have a New method so use this dummy class for the handle.
*/
inline TapGestureDetector GetTapGestureDetector() const { return Internal::Control::GetTapGestureDetector(); }
inline LongPressGestureDetector GetLongPressGestureDetector() const { return Internal::Control::GetLongPressGestureDetector(); }
+ void RegisterVisual( Property::Index index, Actor placementActor, Toolkit::Visual::Base visual);
+ void UnregisterVisual( Property::Index index );
+
// Used to test signal connections
void CustomSlot1( Actor actor );
END_TEST;
}
+int UtcDaliButtonResetSelectedColorP(void)
+{
+ ToolkitTestApplication application;
+ tet_infoline(" UtcDaliButtonSetSelectedColorP");
+
+ PushButton pushButton = PushButton::New();
+ Stage::GetCurrent().Add( pushButton );
+
+ application.SendNotification();
+ application.Render();
+
+ const Vector4 FIRST_COLOR = Color::BLUE;
+ const Vector4 SECOND_COLOR = Color::BLUE;
+
+ pushButton.SetSize( Vector2( 20.0f, 20.0f ) );
+ pushButton.SetProperty( Button::Property::SELECTED_COLOR, FIRST_COLOR );
+
+ application.SendNotification();
+ application.Render();
+
+ Vector4 color = pushButton.GetProperty<Vector4>( Button::Property::SELECTED_COLOR );
+
+ DALI_TEST_EQUALS( color, FIRST_COLOR, TEST_LOCATION );
+
+ pushButton.SetProperty( Button::Property::SELECTED_COLOR, SECOND_COLOR );
+
+ application.SendNotification();
+ application.Render();
+
+ color = pushButton.GetProperty<Vector4>( Button::Property::SELECTED_COLOR );
+
+ DALI_TEST_EQUALS( color, SECOND_COLOR, TEST_LOCATION );
+
+ END_TEST;
+}
#include <dali.h>
#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali/integration-api/events/key-event-integ.h>
#include <dali/integration-api/events/wheel-event-integ.h>
#include <dali/integration-api/events/long-press-gesture-event.h>
END_TEST;
}
+
+int UtcDaliControlImplRegisterThenReRegisterVisual(void)
+{
+ ToolkitTestApplication application;
+
+ DummyControl dummy = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
+
+ Property::Index index =1;
+ Actor placementActor = Actor::New();
+
+ Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
+ Toolkit::Visual::Base visual;
+
+ Property::Map map;
+ map[Visual::Property::TYPE] = Visual::COLOR;
+ map[ColorVisual::Property::MIX_COLOR] = Color::RED;
+
+ visual = visualFactory.CreateVisual( map );
+ DALI_TEST_CHECK(visual);
+
+ // Register index with a color visual
+ dummyImpl.RegisterVisual( index, placementActor, visual );
+
+
+ Property::Map newMap;
+ newMap[Visual::Property::TYPE] = Visual::COLOR;
+ newMap[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
+
+ visual = visualFactory.CreateVisual( newMap );
+ DALI_TEST_CHECK(visual);
+
+ // ReRegister with altered color visual
+ dummyImpl.RegisterVisual( index, placementActor, visual );
+
+ tet_result(TET_PASS);
+
+ END_TEST;
+}
+
+int UtcDaliControlImplRegisterVisaulThenReRegisterToSelf(void)
+{
+ ToolkitTestApplication application;
+
+ DummyControl dummy = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
+
+ Property::Index index =1;
+ Actor placementActor = Actor::New();
+
+ Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
+ Toolkit::Visual::Base visual;
+
+ Property::Map map;
+ map[Visual::Property::TYPE] = Visual::COLOR;
+ map[ColorVisual::Property::MIX_COLOR] = Color::RED;
+
+ visual = visualFactory.CreateVisual( map );
+ DALI_TEST_CHECK(visual);
+
+ // Register index with a color visual
+ dummyImpl.RegisterVisual( index, placementActor, visual );
+
+ // ReRegister to self
+ dummyImpl.RegisterVisual( index, dummy, visual );
+
+ tet_result(TET_PASS);
+
+ END_TEST;
+}
+
+int UtcDaliControlImplRegisterVisualToSelf(void)
+{
+ ToolkitTestApplication application;
+
+ DummyControl dummy = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
+
+ Property::Index index =1;
+ Actor placementActor = Actor::New();
+
+ Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
+ Toolkit::Visual::Base visual;
+
+ Property::Map map;
+ map[Visual::Property::TYPE] = Visual::COLOR;
+ map[ColorVisual::Property::MIX_COLOR] = Color::RED;
+
+ visual = visualFactory.CreateVisual( map );
+ DALI_TEST_CHECK(visual);
+
+ // ReRegister to self
+ dummyImpl.RegisterVisual( index, dummy, visual );
+
+ tet_result(TET_PASS);
+
+ END_TEST;
+}
+
+
+int UtcDaliControlImplRegisterTwoVisuals(void)
+{
+ ToolkitTestApplication application;
+
+ DummyControl dummy = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
+
+ Property::Index index =1;
+ Actor placementActor = Actor::New();
+
+ Property::Index index2 =2;
+ Actor secondPlacementActor = Actor::New();
+
+ Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
+ Toolkit::Visual::Base visual;
+ Toolkit::Visual::Base secondVisual;
+
+ Property::Map map;
+ map[Visual::Property::TYPE] = Visual::COLOR;
+ map[ColorVisual::Property::MIX_COLOR] = Color::RED;
+
+ visual = visualFactory.CreateVisual( map );
+ DALI_TEST_CHECK(visual);
+
+ // Register index with a color visual
+ dummyImpl.RegisterVisual( index, placementActor, visual );
+
+ Property::Map newMap;
+ newMap[Visual::Property::TYPE] = Visual::COLOR;
+ newMap[ColorVisual::Property::MIX_COLOR] = Color::BLUE;
+
+ secondVisual = visualFactory.CreateVisual( newMap );
+
+ // ReRegister with altered color visual
+ dummyImpl.RegisterVisual( index2, secondPlacementActor, secondVisual );
+
+ tet_result(TET_PASS);
+
+ END_TEST;
+}
+
+int UtcDaliControlImplRegisterUnregisterVisual(void)
+{
+ ToolkitTestApplication application;
+
+ DummyControl dummy = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
+
+ Property::Index index =1;
+ Actor placementActor = Actor::New();
+
+ Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
+ Toolkit::Visual::Base visual;
+
+ Property::Map map;
+ map[Visual::Property::TYPE] = Visual::COLOR;
+ map[ColorVisual::Property::MIX_COLOR] = Color::RED;
+
+ visual = visualFactory.CreateVisual( map );
+ DALI_TEST_CHECK(visual);
+
+ // Register index with a color visual
+ dummyImpl.RegisterVisual( index, placementActor, visual );
+
+ // Unregister visual
+ dummyImpl.UnregisterVisual( index );
+
+ tet_result(TET_PASS);
+
+ END_TEST;
+}
{
Actor* contentActor = NULL; // Using a pointer as SetupContent assigns the new Actor to this.
bool imageFileExists = false;
+ Property::Index visualIndex = Toolkit::Button::Property::SELECTED_STATE_IMAGE;
if ( selectedState == SelectedState || selectedState == DisabledSelectedState )
{
mUnselectedColor = color;
contentActor = &mUnselectedContent;
imageFileExists = !GetUnselectedImageFilename().empty();
+ visualIndex = Toolkit::Button::Property::UNSELECTED_STATE_IMAGE;
}
if ( contentActor )
{
// If there is no existing content, create a new actor to use for flat color.
Actor placementActor = Actor::New();
- Toolkit::VisualFactory rendererFactory = Toolkit::VisualFactory::Get();
- Toolkit::Visual::Base colorRenderer;
+ Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
+ Toolkit::Visual::Base visual;
Property::Map map;
map[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::COLOR;
map[ Toolkit::ColorVisual::Property::MIX_COLOR ] = color;
- colorRenderer = rendererFactory.CreateVisual( map );
- colorRenderer.SetOnStage( placementActor );
+ visual = visualFactory.CreateVisual( map );
+
+ RegisterVisual( visualIndex, placementActor, visual );
+ visual.SetOnStage( placementActor );
SetupContent( *contentActor, placementActor ); //
contentActor->SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
{
/**
+ * Struct used to store Visual within the control, index is a unique key for each visual.
+ */
+struct RegisteredVisual
+{
+ Property::Index index;
+ Toolkit::Visual::Base visual;
+ Actor placementActor;
+
+ RegisteredVisual( Property::Index aIndex, Toolkit::Visual::Base &aVisual, Actor &aPlacementActor) : index(aIndex), visual(aVisual), placementActor(aPlacementActor) {}
+};
+
+/**
+ * Finds visual in given array, returning true if found along with the iterator for that visual as a out parameter
+ */
+bool FindVisual( Property::Index targetIndex, std::vector<RegisteredVisual>& visuals, std::vector<RegisteredVisual>::iterator& iter )
+{
+ for ( iter = visuals.begin(); iter != visuals.end(); iter++ )
+ {
+ if ( (*iter).index == targetIndex )
+ {
+ return true;
+ }
+ }
+ return false;
+}
+
+/**
* Creates control through type registry
*/
BaseHandle Create()
// Data
Control& mControlImpl;
+ std::vector<RegisteredVisual> mVisuals; // Stores visuals needed by the control, non trivial type so std::vector used.
std::string mStyleName;
Toolkit::Visual::Base mBackgroundVisual; ///< The visual to render the background
Vector4 mBackgroundColor; ///< The color of the background visual
OnKeyboardEnter();
}
+void Control::RegisterVisual( Property::Index index, Actor placementActor, Toolkit::Visual::Base visual )
+{
+ bool visualReplaced ( false );
+ Actor actorToRegister; // Null actor, replaced if placement actor not Self
+
+ if ( placementActor != Self() ) // Prevent increasing ref count if actor self
+ {
+ actorToRegister = placementActor;
+ }
+
+ if ( !mImpl->mVisuals.empty() )
+ {
+ std::vector<RegisteredVisual>::iterator iter;
+ // Check if visual (index) is already registered. Replace if so.
+ if ( FindVisual( index, mImpl->mVisuals, iter ) )
+ {
+ (*iter).visual = visual;
+ (*iter).placementActor = actorToRegister;
+ visualReplaced = true;
+ }
+ }
+
+ if ( !visualReplaced ) // New registration entry
+ {
+ RegisteredVisual newVisual = RegisteredVisual( index, visual, actorToRegister );
+ mImpl->mVisuals.push_back( newVisual );
+ }
+}
+
+void Control::UnregisterVisual( Property::Index index )
+{
+ std::vector< RegisteredVisual >::iterator iter;
+ if ( FindVisual( index, mImpl->mVisuals, iter ) )
+ {
+ mImpl->mVisuals.erase( iter );
+ }
+}
+
bool Control::OnAccessibilityActivated()
{
return false; // Accessibility activation is not handled by default
class StyleManager;
+namespace Visual
+{
+class Base;
+}
namespace Internal
{
/**
protected: // For derived classes to call
/**
+ * @brief Register a visual by Property Index, linking an Actor to controlRenderer when required.
+ * In the case of the visual being an actor or control deeming controlRenderer not required then controlRenderer should be an empty handle.
+ * No parenting is done during registration, this should be done by derived class.
+ *
+ * @SINCE_1_1.46
+ *
+ * @param[in] index The Property index of the visual, used to reference visual
+ * @param[in] placementActor The actor used to by the visual.
+ * @param[in] visual The visual to register
+ */
+ void RegisterVisual( Property::Index index, Actor placementActor, Toolkit::Visual::Base visual );
+
+ /**
+ * @brief Erase the entry matching the given index from the list of registered visuals
+ * @param[in] index The Property index of the visual, used to reference visual
+ *
+ * @SINCE_1_1.46
+ */
+ void UnregisterVisual( Property::Index index );
+
+ /**
* @brief Emits KeyInputFocusGained signal if true else emits KeyInputFocusLost signal
*
* Should be called last by the control after it acts on the Input Focus change.