From 32c501563f48bedb5136835c41254e152f611bfe Mon Sep 17 00:00:00 2001 From: "Seungho, Baek" Date: Fri, 10 Apr 2020 18:00:40 +0900 Subject: [PATCH 01/16] Doxy patch for Capture ACR Change-Id: I62bacba01a73244489ff3286b598a229522694b6 Signed-off-by: Seungho, Baek --- build/tizen/docs/dali.doxy.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/tizen/docs/dali.doxy.in b/build/tizen/docs/dali.doxy.in index 7f304a8..591c29f 100644 --- a/build/tizen/docs/dali.doxy.in +++ b/build/tizen/docs/dali.doxy.in @@ -413,12 +413,12 @@ ALIASES += REMARK_RAWVIDEO="" #ALIASES += SINCE_1_2_32="\par Since:\n 3.0, DALi version 1.2.32" ## Extra tags for Tizen 4.0 -#ALIASES += SINCE_1_3_4="\par Since:\n 4.0, DALi version 1.3.4" +#ALIASES += SINCE_1_3_4="\par Since:\n @if WEARABLE 4.0 @elseif 6.0 @endif, DALi version 1.3.4" #ALIASES += SINCE_1_3_5="\par Since:\n 4.0, DALi version 1.3.5" #ALIASES += SINCE_1_3_9="\par Since:\n 4.0, DALi version 1.3.9" #ALIASES += SINCE_1_3_15="\par Since:\n 4.0, DALi version 1.3.15" -#Extra tags for Tizen 5.5 +##Extra tags for Tizen 5.5 #ALIASES += SINCE_1_3_31="\par Since:\n 5.5, DALi version 1.3.31" #ALIASES += SINCE_1_5_9="\par Since:\n 5.5, DALi version 1.5.9" -- 2.7.4 From e55ceb6575f28fd81082faa7c76f41a523b71266 Mon Sep 17 00:00:00 2001 From: Ali Date: Mon, 20 Apr 2020 10:51:54 +0300 Subject: [PATCH 02/16] Add support to unselect text And Get_SelectedText This patch add two kind of support for TextField 1- SelectNone function: this will unselect text in textfield Programmatically by user. 2- Selected_Text property: this is readonly to return string for selected text. After this patch approve, I will create other one for dali-csharp-bindings Change-Id: If93ed6df44a41ff00f772a0abcfc9e2401c41480 --- .../utc-Dali-Text-Controller.cpp | 4 +- .../src/dali-toolkit/utc-Dali-TextField.cpp | 49 ++++++++++++++++++++++ .../controls/text-controls/text-field-devel.cpp | 5 +++ .../controls/text-controls/text-field-devel.h | 26 +++++++++++- .../controls/text-controls/text-field-impl.cpp | 20 ++++++++- .../controls/text-controls/text-field-impl.h | 11 +++++ .../internal/text/text-controller-impl.cpp | 26 ++++++++++++ dali-toolkit/internal/text/text-controller-impl.h | 5 ++- dali-toolkit/internal/text/text-controller.cpp | 23 ++++++++-- dali-toolkit/internal/text/text-controller.h | 21 +++++++++- .../public-api/controls/text-controls/text-field.h | 2 +- 11 files changed, 179 insertions(+), 13 deletions(-) diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp index 3e53b67..0e8a597 100755 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp @@ -1124,7 +1124,7 @@ int UtcDaliTextControllerSelectEvent(void) controller->SetText( text ); // Select the whole text. - controller->SelectEvent( 0.f, 0.f, false ); + controller->SelectEvent( 0.f, 0.f, SelectionType::INTERACTIVE ); // Perform a relayout const Size size( Dali::Stage::GetCurrent().GetSize() ); @@ -1139,7 +1139,7 @@ int UtcDaliTextControllerSelectEvent(void) DALI_TEST_EQUALS( "Hello", retrieved_text, TEST_LOCATION ); // Select the whole text. - controller->SelectEvent( 0.f, 0.f, true ); + controller->SelectEvent( 0.f, 0.f, SelectionType::ALL ); // Perform a relayout controller->Relayout( size ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp index 7e050ff..e58ab4d 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp @@ -2872,3 +2872,52 @@ int UtcDaliTextFieldSelectWholeText(void) END_TEST; } + +int UtcDaliTextFieldSelectNone(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliTextFieldSelectWholeText "); + + TextField textField = TextField::New(); + + Stage::GetCurrent().Add( textField ); + + textField.SetSize( 300.f, 50.f ); + textField.SetParentOrigin( ParentOrigin::TOP_LEFT ); + textField.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + + // Avoid a crash when core load gl resources. + application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); + + application.SendNotification(); + application.Render(); + + textField.SetProperty( TextField::Property::TEXT, "Hello world" ); + + application.SendNotification(); + application.Render(); + + // Nothing is selected + std::string selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get(); + DALI_TEST_EQUALS( "", selectedText, TEST_LOCATION ); + + DevelTextField::SelectWholeText( textField ); + + application.SendNotification(); + application.Render(); + + // whole text is selected + selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get(); + DALI_TEST_EQUALS( "Hello world", selectedText, TEST_LOCATION ); + + DevelTextField::SelectNone( textField ); + + application.SendNotification(); + application.Render(); + + // Nothing is selected + selectedText = textField.GetProperty( DevelTextField::Property::SELECTED_TEXT ).Get(); + DALI_TEST_EQUALS( "", selectedText, TEST_LOCATION ); + + END_TEST; +} diff --git a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.cpp b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.cpp index a53ef4a..e926401 100755 --- a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.cpp +++ b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.cpp @@ -38,6 +38,11 @@ void SelectWholeText( TextField textField ) GetImpl( textField ).SelectWholeText(); } +void SelectNone( TextField textField ) +{ + GetImpl( textField ).SelectNone(); +} + } // namespace DevelText } // namespace Toolkit diff --git a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h index 3a4864c..0d10779 100755 --- a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h @@ -122,7 +122,15 @@ namespace Property * @note Use "textBackground" as property name to avoid conflict with Control's "background" property. * @note The default value is Color::TRANSPARENT. */ - BACKGROUND = ELLIPSIS + 5 + BACKGROUND = ELLIPSIS + 5, + + + /** + * @brief The selected text in UTF-8 format. + * @details Name "selectedText", type Property::STRING. + * @note This property is read-only. + */ + SELECTED_TEXT = ELLIPSIS + 6 }; } // namespace Property @@ -139,10 +147,24 @@ DALI_TOOLKIT_API InputMethodContext GetInputMethodContext( TextField textField ) * @brief Select the whole text of TextField. * * @param[in] textField The instance of TextField. - * @return InputMethodContext instance. */ DALI_TOOLKIT_API void SelectWholeText( TextField textField ); +/** + * @brief Unselect the whole text of TextField. + * + * @param[in] textField The instance of TextField. + */ +DALI_TOOLKIT_API void SelectNone( TextField textField ); + +/** + * @brief Get the selected text of TextField. + * + * @param[in] textField The instance of TextField. + * @return Selected text in the TextField. + */ +DALI_TOOLKIT_API std::string SelectedText( TextField textField ); + } // namespace DevelText } // namespace Toolkit diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp index e9d1fe4..f9b4b70 100755 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -135,6 +135,7 @@ DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "enableGrabHandle", DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "matchSystemLanguageDirection", BOOLEAN, MATCH_SYSTEM_LANGUAGE_DIRECTION ) DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "enableGrabHandlePopup", BOOLEAN, ENABLE_GRAB_HANDLE_POPUP ) DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "textBackground", VECTOR4, BACKGROUND ) +DALI_DEVEL_PROPERTY_REGISTRATION_READ_ONLY( Toolkit, TextField, "selectedText", STRING, SELECTED_TEXT ) DALI_SIGNAL_REGISTRATION( Toolkit, TextField, "textChanged", SIGNAL_TEXT_CHANGED ) DALI_SIGNAL_REGISTRATION( Toolkit, TextField, "maxLengthReached", SIGNAL_MAX_LENGTH_REACHED ) @@ -1212,6 +1213,14 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } break; } + case Toolkit::DevelTextField::Property::SELECTED_TEXT: + { + if( impl.mController ) + { + value = impl.mController->GetSelectedText( ); + } + break; + } } //switch } @@ -1222,7 +1231,16 @@ void TextField::SelectWholeText() { if( mController && mController->IsShowingRealText() ) { - mController->SelectEvent( 0.f, 0.f, true ); + mController->SelectEvent( 0.f, 0.f, SelectionType::ALL ); + SetKeyInputFocus(); + } +} + +void TextField::SelectNone() +{ + if( mController && mController->IsShowingRealText() ) + { + mController->SelectEvent( 0.f, 0.f, SelectionType::NONE ); SetKeyInputFocus(); } } diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.h b/dali-toolkit/internal/controls/text-controls/text-field-impl.h index 25bd4bd..3fd32a0 100755 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h @@ -107,6 +107,17 @@ public: */ void SelectWholeText(); + /** + * @brief Called to unselect the whole texts. + */ + void SelectNone(); + + /** + * @brief Called to get selected text. + * @return Selected text in the TextField. + */ + std::string SelectedText(); + private: // From Control /** diff --git a/dali-toolkit/internal/text/text-controller-impl.cpp b/dali-toolkit/internal/text/text-controller-impl.cpp index 8f4de65..4df4d38 100755 --- a/dali-toolkit/internal/text/text-controller-impl.cpp +++ b/dali-toolkit/internal/text/text-controller-impl.cpp @@ -221,6 +221,11 @@ bool Controller::Impl::ProcessInputEvents() OnSelectAllEvent(); break; } + case Event::SELECT_NONE: + { + OnSelectNoneEvent(); + break; + } } } } @@ -2015,6 +2020,27 @@ void Controller::Impl::OnSelectAllEvent() } } +void Controller::Impl::OnSelectNoneEvent() +{ + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "OnSelectNoneEvent mEventData->mSelectionEnabled%s \n", mEventData->mSelectionEnabled?"true":"false"); + + if( NULL == mEventData ) + { + // Nothing to do if there is no text. + return; + } + + if( mEventData->mSelectionEnabled && mEventData->mState == EventData::SELECTING) + { + mEventData->mPrimaryCursorPosition = 0u; + mEventData->mLeftSelectionPosition = mEventData->mRightSelectionPosition = mEventData->mPrimaryCursorPosition; + ChangeState( EventData::INACTIVE ); + mEventData->mUpdateCursorPosition = true; + mEventData->mUpdateInputStyle = true; + mEventData->mScrollAfterUpdatePosition = true; + } +} + void Controller::Impl::RetrieveSelection( std::string& selectedText, bool deleteAfterRetrieval ) { if( mEventData->mLeftSelectionPosition == mEventData->mRightSelectionPosition ) diff --git a/dali-toolkit/internal/text/text-controller-impl.h b/dali-toolkit/internal/text/text-controller-impl.h index 064d644..981e498 100755 --- a/dali-toolkit/internal/text/text-controller-impl.h +++ b/dali-toolkit/internal/text/text-controller-impl.h @@ -61,7 +61,8 @@ struct Event LEFT_SELECTION_HANDLE_EVENT, RIGHT_SELECTION_HANDLE_EVENT, SELECT, - SELECT_ALL + SELECT_ALL, + SELECT_NONE, }; union Param @@ -619,6 +620,8 @@ struct Controller::Impl void OnSelectAllEvent(); + void OnSelectNoneEvent(); + /** * @brief Retrieves the selected text. It removes the text if the @p deleteAfterRetrieval parameter is @e true. * diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 8aaefae..b4624dc 100755 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -3033,17 +3033,22 @@ void Controller::LongPressEvent( Gesture::State state, float x, float y ) } } -void Controller::SelectEvent( float x, float y, bool selectAll ) +void Controller::SelectEvent( float x, float y, SelectionType selectType ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SelectEvent\n" ); if( NULL != mImpl->mEventData ) { - if( selectAll ) + if( selectType == SelectionType::ALL ) { Event event( Event::SELECT_ALL ); mImpl->mEventData->mEventQueue.push_back( event ); } + else if( selectType == SelectionType::NONE ) + { + Event event( Event::SELECT_NONE ); + mImpl->mEventData->mEventQueue.push_back( event ); + } else { Event event( Event::SELECT ); @@ -3326,14 +3331,14 @@ void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Butt if( mImpl->mEventData->mSelectionEnabled ) { // Creates a SELECT event. - SelectEvent( currentCursorPosition.x, currentCursorPosition.y, false ); + SelectEvent( currentCursorPosition.x, currentCursorPosition.y, SelectionType::INTERACTIVE ); } break; } case Toolkit::TextSelectionPopup::SELECT_ALL: { // Creates a SELECT_ALL event - SelectEvent( 0.f, 0.f, true ); + SelectEvent( 0.f, 0.f, SelectionType::ALL ); break; } case Toolkit::TextSelectionPopup::CLIPBOARD: @@ -3755,6 +3760,16 @@ bool Controller::RemoveSelectedText() return textRemoved; } +std::string Controller::GetSelectedText() +{ + std::string text; + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + mImpl->RetrieveSelection( text, false ); + } + return text; +} + // private : Relayout. bool Controller::DoRelayout( const Size& size, diff --git a/dali-toolkit/internal/text/text-controller.h b/dali-toolkit/internal/text/text-controller.h index 82a7a15..6a986f5 100755 --- a/dali-toolkit/internal/text/text-controller.h +++ b/dali-toolkit/internal/text/text-controller.h @@ -47,6 +47,16 @@ class EditableControlInterface; class View; class RenderingController; + /** + * @brief Text selection operations . + */ + enum SelectionType + { + INTERACTIVE = 0x0000, + ALL = 0x0001, + NONE = 0x0002 + }; + typedef IntrusivePtr ControllerPtr; /** @@ -1462,9 +1472,9 @@ public: // Text-input Event Queuing. * * @param[in] x The x position relative to the top-left of the parent control. * @param[in] y The y position relative to the top-left of the parent control. - * @param[in] selectAll Whether the whole text is selected. + * @param[in] selection type like the whole text is selected or unselected. */ - void SelectEvent( float x, float y, bool selectAll ); + void SelectEvent( float x, float y, SelectionType selection ); /** * @brief Event received from input method context @@ -1494,6 +1504,13 @@ public: // Text-input Event Queuing. */ Actor CreateBackgroundActor(); + /** + * @brief Retrive Selected text. + * + * @return The seleced text. + */ + std::string GetSelectedText(); + protected: // Inherit from Text::Decorator::ControllerInterface. /** diff --git a/dali-toolkit/public-api/controls/text-controls/text-field.h b/dali-toolkit/public-api/controls/text-controls/text-field.h index 133b2c7..6ac1887 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-field.h +++ b/dali-toolkit/public-api/controls/text-controls/text-field.h @@ -472,7 +472,7 @@ public: * @SINCE_1_2.60 * @note PLACEHOLDER map is used to add ellipsis to placeholder text. */ - ELLIPSIS, + ELLIPSIS }; }; -- 2.7.4 From 2a2a8820f28caea3802484e41a8c2459773ebebd Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Wed, 6 May 2020 16:50:31 +0900 Subject: [PATCH 03/16] DALi Version 1.5.10 Change-Id: I5adb8febacf31f6465e3202a6d73229281ea0395 --- dali-toolkit/public-api/dali-toolkit-version.cpp | 2 +- packaging/dali-toolkit.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index 68c5073..f6d8027 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -31,7 +31,7 @@ namespace Toolkit const unsigned int TOOLKIT_MAJOR_VERSION = 1; const unsigned int TOOLKIT_MINOR_VERSION = 5; -const unsigned int TOOLKIT_MICRO_VERSION = 9; +const unsigned int TOOLKIT_MICRO_VERSION = 10; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 0f574ca..71e75e1 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali-toolkit Summary: Dali 3D engine Toolkit -Version: 1.5.9 +Version: 1.5.10 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT -- 2.7.4 From 23eacf8fa14ff20d37d5edb0f97af652e9149304 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Wed, 6 May 2020 20:06:45 +0900 Subject: [PATCH 04/16] Update a font description run only in Selecting state for input font - When setting input font properties, its font description run has been updated in InsertText(). - UpdateSelectionFontStyleRun() resets the FontDescriptionRun value already set. - So, only in EventData::SELECTING state, updated a new font description run. Change-Id: I5c6643f919e077b2870d04c8a881ab9a1d125811 Signed-off-by: Seoyeon Kim --- .../utc-Dali-Text-Controller.cpp | 40 +++++ dali-toolkit/internal/text/text-controller.cpp | 161 ++++++++++++++------- 2 files changed, 148 insertions(+), 53 deletions(-) diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp index 0e8a597..5db928d 100755 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp @@ -1192,3 +1192,43 @@ int UtcDaliTextControllerRemoveTextChangeEventData(void) END_TEST; } + +int UtcDaliTextControllerCheckInputFontPointSizeUpdated(void) +{ + tet_infoline(" UtcDaliTextControllerCheckInputFontPointSizeUpdated"); + ToolkitTestApplication application; + + // Creates a text controller. + ControllerPtr controller = Controller::New(); + + ConfigureTextField(controller); + + // Set the text + const std::string text("Hello World!"); + controller->SetText( text ); + controller->SetInputFontPointSize( 1.0f ); + controller->KeyboardFocusGainEvent(); + + application.SendNotification(); + application.Render(); + + // Perform a relayout + const Size size( Dali::Stage::GetCurrent().GetSize() ); + controller->Relayout(size); + + // simulate a key event. + controller->KeyEvent( GenerateKey( "a", "a", 38, 0, 0, Dali::KeyEvent::Down ) ); + + // change the input font point size + controller->SetInputFontPointSize( 20.f ); + + application.SendNotification(); + application.Render(); + + // Perform a relayout + controller->Relayout(size); + + tet_result(TET_PASS); + + END_TEST; +} diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index b4624dc..9a46e8b 100755 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -1520,17 +1520,32 @@ void Controller::SetInputFontFamily( const std::string& fontFamily ) { CharacterIndex startOfSelectedText = 0u; Length lengthOfSelectedText = 0u; - FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mModel->mLogicalModel, - startOfSelectedText, - lengthOfSelectedText ); - fontDescriptionRun.familyLength = fontFamily.size(); - fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength]; - memcpy( fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength ); - fontDescriptionRun.familyDefined = true; + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + // Update a font description run for the selecting state. + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mModel->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); - // The memory allocated for the font family name is freed when the font description is removed from the logical model. + fontDescriptionRun.familyLength = fontFamily.size(); + fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength]; + memcpy( fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength ); + fontDescriptionRun.familyDefined = true; + + // The memory allocated for the font family name is freed when the font description is removed from the logical model. + + mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; + } + else + { + mImpl->mTextUpdateInfo.mCharacterIndex = 0; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); + } // Request to relayout. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | @@ -1544,10 +1559,6 @@ void Controller::SetInputFontFamily( const std::string& fontFamily ) mImpl->mRecalculateNaturalSize = true; mImpl->RequestRelayout(); - mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; - // As the font changes, recalculate the handle positions is needed. mImpl->mEventData->mUpdateLeftSelectionPosition = true; mImpl->mEventData->mUpdateRightSelectionPosition = true; @@ -1579,13 +1590,28 @@ void Controller::SetInputFontWeight( FontWeight weight ) { CharacterIndex startOfSelectedText = 0u; Length lengthOfSelectedText = 0u; - FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mModel->mLogicalModel, - startOfSelectedText, - lengthOfSelectedText ); - fontDescriptionRun.weight = weight; - fontDescriptionRun.weightDefined = true; + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + // Update a font description run for the selecting state. + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mModel->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); + + fontDescriptionRun.weight = weight; + fontDescriptionRun.weightDefined = true; + + mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; + } + else + { + mImpl->mTextUpdateInfo.mCharacterIndex = 0; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); + } // Request to relayout. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | @@ -1599,10 +1625,6 @@ void Controller::SetInputFontWeight( FontWeight weight ) mImpl->mRecalculateNaturalSize = true; mImpl->RequestRelayout(); - mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; - // As the font might change, recalculate the handle positions is needed. mImpl->mEventData->mUpdateLeftSelectionPosition = true; mImpl->mEventData->mUpdateRightSelectionPosition = true; @@ -1645,13 +1667,28 @@ void Controller::SetInputFontWidth( FontWidth width ) { CharacterIndex startOfSelectedText = 0u; Length lengthOfSelectedText = 0u; - FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mModel->mLogicalModel, - startOfSelectedText, - lengthOfSelectedText ); - fontDescriptionRun.width = width; - fontDescriptionRun.widthDefined = true; + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + // Update a font description run for the selecting state. + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mModel->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); + + fontDescriptionRun.width = width; + fontDescriptionRun.widthDefined = true; + + mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; + } + else + { + mImpl->mTextUpdateInfo.mCharacterIndex = 0; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); + } // Request to relayout. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | @@ -1665,10 +1702,6 @@ void Controller::SetInputFontWidth( FontWidth width ) mImpl->mRecalculateNaturalSize = true; mImpl->RequestRelayout(); - mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; - // As the font might change, recalculate the handle positions is needed. mImpl->mEventData->mUpdateLeftSelectionPosition = true; mImpl->mEventData->mUpdateRightSelectionPosition = true; @@ -1711,13 +1744,28 @@ void Controller::SetInputFontSlant( FontSlant slant ) { CharacterIndex startOfSelectedText = 0u; Length lengthOfSelectedText = 0u; - FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mModel->mLogicalModel, - startOfSelectedText, - lengthOfSelectedText ); - fontDescriptionRun.slant = slant; - fontDescriptionRun.slantDefined = true; + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + // Update a font description run for the selecting state. + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mModel->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); + + fontDescriptionRun.slant = slant; + fontDescriptionRun.slantDefined = true; + + mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; + } + else + { + mImpl->mTextUpdateInfo.mCharacterIndex = 0; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); + } // Request to relayout. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | @@ -1731,10 +1779,6 @@ void Controller::SetInputFontSlant( FontSlant slant ) mImpl->mRecalculateNaturalSize = true; mImpl->RequestRelayout(); - mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; - // As the font might change, recalculate the handle positions is needed. mImpl->mEventData->mUpdateLeftSelectionPosition = true; mImpl->mEventData->mUpdateRightSelectionPosition = true; @@ -1777,13 +1821,28 @@ void Controller::SetInputFontPointSize( float size ) { CharacterIndex startOfSelectedText = 0u; Length lengthOfSelectedText = 0u; - FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mModel->mLogicalModel, - startOfSelectedText, - lengthOfSelectedText ); - fontDescriptionRun.size = static_cast( size * 64.f ); - fontDescriptionRun.sizeDefined = true; + if( EventData::SELECTING == mImpl->mEventData->mState ) + { + // Update a font description run for the selecting state. + FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, + mImpl->mModel->mLogicalModel, + startOfSelectedText, + lengthOfSelectedText ); + + fontDescriptionRun.size = static_cast( size * 64.f ); + fontDescriptionRun.sizeDefined = true; + + mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; + } + else + { + mImpl->mTextUpdateInfo.mCharacterIndex = 0; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); + } // Request to relayout. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | @@ -1797,10 +1856,6 @@ void Controller::SetInputFontPointSize( float size ) mImpl->mRecalculateNaturalSize = true; mImpl->RequestRelayout(); - mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; - // As the font might change, recalculate the handle positions is needed. mImpl->mEventData->mUpdateLeftSelectionPosition = true; mImpl->mEventData->mUpdateRightSelectionPosition = true; -- 2.7.4 From 8c95b9918d50af7bd6a2b99c3c561dad98e84b68 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Wed, 13 May 2020 10:57:27 +0900 Subject: [PATCH 05/16] DALi Version 1.5.11 Change-Id: I3f871a321b667198f4b8e7dcce82f8bece25efb4 --- dali-toolkit/public-api/dali-toolkit-version.cpp | 2 +- packaging/dali-toolkit.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index f6d8027..340d5e9 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -31,7 +31,7 @@ namespace Toolkit const unsigned int TOOLKIT_MAJOR_VERSION = 1; const unsigned int TOOLKIT_MINOR_VERSION = 5; -const unsigned int TOOLKIT_MICRO_VERSION = 10; +const unsigned int TOOLKIT_MICRO_VERSION = 11; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 71e75e1..5ba4e12 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali-toolkit Summary: Dali 3D engine Toolkit -Version: 1.5.10 +Version: 1.5.11 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT -- 2.7.4 From 70e9012b77d2f2e5d4057ecc60c2a0754a9c9ccf Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Thu, 16 Apr 2020 14:41:52 +0900 Subject: [PATCH 06/16] Support rounded corners for GradientVisual Change-Id: Ibb63224756ad34359f84a7c620231a0cfa61ae3e --- .../src/dali-toolkit/utc-Dali-Visual.cpp | 45 +++++++ .../internal/visuals/gradient/gradient-visual.cpp | 142 ++++++++++++++++++--- .../internal/visuals/visual-factory-cache.h | 4 + 3 files changed, 174 insertions(+), 17 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp index 0a86423..aa1e8f6 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp @@ -3689,6 +3689,51 @@ int UtcDaliVisualRoundedCorner(void) DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadius", cornerRadius ), true, TEST_LOCATION ); } + // gradient visual + { + VisualFactory factory = VisualFactory::Get(); + Property::Map properties; + float cornerRadius = 30.0f; + + properties[Visual::Property::TYPE] = Visual::GRADIENT; + properties[ColorVisual::Property::MIX_COLOR] = Color::BLUE; + properties[DevelVisual::Property::CORNER_RADIUS] = cornerRadius; + properties[GradientVisual::Property::START_POSITION] = Vector2( 0.5f, 0.5f ); + properties[GradientVisual::Property::END_POSITION] = Vector2( -0.5f, -0.5f ); + properties[GradientVisual::Property::UNITS] = GradientVisual::Units::USER_SPACE; + + Property::Array stopOffsets; + stopOffsets.PushBack( 0.0f ); + stopOffsets.PushBack( 0.6f ); + stopOffsets.PushBack( 1.0f ); + properties[GradientVisual::Property::STOP_OFFSET] = stopOffsets; + + Property::Array stopColors; + stopColors.PushBack( Color::RED ); + stopColors.PushBack( Color::YELLOW ); + stopColors.PushBack( Color::GREEN ); + properties[GradientVisual::Property::STOP_COLOR] = stopColors; + + Visual::Base visual = factory.CreateVisual( properties ); + + // trigger creation through setting on stage + DummyControl dummy = DummyControl::New( true ); + Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); + dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + + dummy.SetSize( 200.f, 200.f ); + dummy.SetParentOrigin( ParentOrigin::CENTER ); + Stage::GetCurrent().Add( dummy ); + + application.SendNotification(); + application.Render(); + + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue< float >( "cornerRadius", cornerRadius ), true, TEST_LOCATION ); + } + END_TEST; } diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp index 53ea041..e1959e7 100644 --- a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp +++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 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. @@ -67,28 +67,26 @@ const char * const UNIFORM_ALIGNMENT_MATRIX_NAME( "uAlignmentMatrix" ); const unsigned int DEFAULT_OFFSET_MINIMUM = 0.0f; const unsigned int DEFAULT_OFFSET_MAXIMUM = 1.0f; -VisualFactoryCache::ShaderType GetShaderType( GradientVisual::Type type, Toolkit::GradientVisual::Units::Type units ) +VisualFactoryCache::ShaderType SHADER_TYPE_TABLE[][4] = { - if( type == GradientVisual::LINEAR ) { - if( units == Toolkit::GradientVisual::Units::USER_SPACE ) - { - return VisualFactoryCache::GRADIENT_SHADER_LINEAR_USER_SPACE; - } - return VisualFactoryCache::GRADIENT_SHADER_LINEAR_BOUNDING_BOX; - } - else if( units == Toolkit::GradientVisual::Units::USER_SPACE ) + VisualFactoryCache::GRADIENT_SHADER_LINEAR_USER_SPACE, + VisualFactoryCache::GRADIENT_SHADER_LINEAR_BOUNDING_BOX, + VisualFactoryCache::GRADIENT_SHADER_LINEAR_USER_SPACE_ROUNDED_CORNER, + VisualFactoryCache::GRADIENT_SHADER_LINEAR_BOUNDING_BOX_ROUNDED_CORNER + }, { - return VisualFactoryCache::GRADIENT_SHADER_RADIAL_USER_SPACE; + VisualFactoryCache::GRADIENT_SHADER_RADIAL_USER_SPACE, + VisualFactoryCache::GRADIENT_SHADER_RADIAL_BOUNDING_BOX, + VisualFactoryCache::GRADIENT_SHADER_RADIAL_USER_SPACE_ROUNDED_CORNER, + VisualFactoryCache::GRADIENT_SHADER_RADIAL_BOUNDING_BOX_ROUNDED_CORNER } - - return VisualFactoryCache::GRADIENT_SHADER_RADIAL_BOUNDING_BOX; -} +}; const char* VERTEX_SHADER[] = { // vertex shader for gradient units as OBJECT_BOUNDING_BOX - DALI_COMPOSE_SHADER( +DALI_COMPOSE_SHADER( attribute mediump vec2 aPosition;\n uniform highp mat4 uMvpMatrix;\n uniform mediump vec3 uSize;\n @@ -150,6 +148,79 @@ DALI_COMPOSE_SHADER( \n vTexCoord = (uAlignmentMatrix*vertexPosition.xyw).xy;\n }\n +), + +// vertex shader for gradient units as OBJECT_BOUNDING_BOX with corner radius +DALI_COMPOSE_SHADER( + attribute mediump vec2 aPosition;\n + uniform highp mat4 uMvpMatrix;\n + uniform mediump vec3 uSize;\n + uniform mediump mat3 uAlignmentMatrix;\n + varying mediump vec2 vTexCoord;\n + varying mediump vec2 vPosition;\n + varying mediump vec2 vRectSize;\n + \n + //Visual size and offset + uniform mediump vec2 offset;\n + uniform mediump vec2 size;\n + uniform mediump vec4 offsetSizeMode;\n + uniform mediump vec2 origin;\n + uniform mediump vec2 anchorPoint;\n + uniform mediump float cornerRadius;\n + + vec4 ComputeVertexPosition()\n + {\n + vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n + vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n + vRectSize = visualSize * 0.5 - cornerRadius;\n + vPosition = aPosition * visualSize;\n + return vec4( (aPosition + anchorPoint)*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );\n + }\n + + void main()\n + {\n + mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);\n + vTexCoord = (uAlignmentMatrix*vertexPosition.xyw).xy;\n + \n + gl_Position = uMvpMatrix * ComputeVertexPosition();\n + }\n +), + +// vertex shader for gradient units as USER_SPACE with corner radius +DALI_COMPOSE_SHADER( + attribute mediump vec2 aPosition;\n + uniform highp mat4 uMvpMatrix;\n + uniform mediump vec3 uSize;\n + uniform mediump mat3 uAlignmentMatrix;\n + varying mediump vec2 vTexCoord;\n + varying mediump vec2 vPosition;\n + varying mediump vec2 vRectSize;\n + \n + //Visual size and offset + uniform mediump vec2 offset;\n + uniform mediump vec2 size;\n + uniform mediump vec4 offsetSizeMode;\n + uniform mediump vec2 origin;\n + uniform mediump vec2 anchorPoint;\n + uniform mediump float cornerRadius;\n + + vec4 ComputeVertexPosition()\n + {\n + vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );\n + vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);\n + vRectSize = visualSize * 0.5 - cornerRadius;\n + vPosition = aPosition * visualSize;\n + return vec4( (aPosition + anchorPoint)*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );\n + }\n + + void main()\n + {\n + mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);\n + vertexPosition.xyz *= uSize;\n + gl_Position = uMvpMatrix * ComputeVertexPosition();\n + \n + vTexCoord = (uAlignmentMatrix*vertexPosition.xyw).xy;\n + }\n ) }; @@ -179,6 +250,42 @@ DALI_COMPOSE_SHADER( {\n gl_FragColor = texture2D( sTexture, vec2( length(vTexCoord), 0.5 ) ) * vec4(mixColor, 1.0) * uColor;\n }\n +), + +// fragment shader for linear gradient with corner radius +DALI_COMPOSE_SHADER( + uniform sampler2D sTexture;\n // sampler1D? + uniform lowp vec4 uColor;\n + uniform lowp vec3 mixColor;\n + uniform mediump float cornerRadius;\n + varying mediump vec2 vTexCoord;\n + varying mediump vec2 vPosition;\n + varying mediump vec2 vRectSize;\n + \n + void main()\n + {\n + mediump float dist = length( max( abs( vPosition ), vRectSize ) - vRectSize ) - cornerRadius;\n + gl_FragColor = texture2D( sTexture, vec2( vTexCoord.y, 0.5 ) ) * vec4(mixColor, 1.0) * uColor;\n + gl_FragColor *= 1.0 - smoothstep( -1.0, 1.0, dist );\n + }\n +), + +// fragment shader for radial gradient with corner radius +DALI_COMPOSE_SHADER( + uniform sampler2D sTexture;\n // sampler1D? + uniform lowp vec4 uColor;\n + uniform lowp vec3 mixColor;\n + uniform mediump float cornerRadius;\n + varying mediump vec2 vTexCoord;\n + varying mediump vec2 vPosition;\n + varying mediump vec2 vRectSize;\n + \n + void main()\n + {\n + mediump float dist = length( max( abs( vPosition ), vRectSize ) - vRectSize ) - cornerRadius;\n + gl_FragColor = texture2D( sTexture, vec2( length(vTexCoord), 0.5 ) ) * vec4(mixColor, 1.0) * uColor;\n + gl_FragColor *= 1.0 - smoothstep( -1.0, 1.0, dist );\n + }\n ) }; @@ -321,11 +428,12 @@ void GradientVisual::InitializeRenderer() Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::QUAD_GEOMETRY ); Toolkit::GradientVisual::Units::Type gradientUnits = mGradient->GetGradientUnits(); - VisualFactoryCache::ShaderType shaderType = GetShaderType( mGradientType, gradientUnits ); + int roundedCorner = IsRoundedCornerRequired() ? 1 : 0; + VisualFactoryCache::ShaderType shaderType = SHADER_TYPE_TABLE[mGradientType][gradientUnits + roundedCorner * 2]; Shader shader = mFactoryCache.GetShader( shaderType ); if( !shader ) { - shader = Shader::New( VERTEX_SHADER[gradientUnits], FRAGMENT_SHADER[ mGradientType ] ); + shader = Shader::New( VERTEX_SHADER[gradientUnits + roundedCorner * 2], FRAGMENT_SHADER[ mGradientType + roundedCorner * 2 ] ); mFactoryCache.SaveShader( shaderType, shader ); } diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.h b/dali-toolkit/internal/visuals/visual-factory-cache.h index e3629d3..f22fb86 100644 --- a/dali-toolkit/internal/visuals/visual-factory-cache.h +++ b/dali-toolkit/internal/visuals/visual-factory-cache.h @@ -66,6 +66,10 @@ public: GRADIENT_SHADER_LINEAR_BOUNDING_BOX, GRADIENT_SHADER_RADIAL_USER_SPACE, GRADIENT_SHADER_RADIAL_BOUNDING_BOX, + GRADIENT_SHADER_LINEAR_USER_SPACE_ROUNDED_CORNER, + GRADIENT_SHADER_LINEAR_BOUNDING_BOX_ROUNDED_CORNER, + GRADIENT_SHADER_RADIAL_USER_SPACE_ROUNDED_CORNER, + GRADIENT_SHADER_RADIAL_BOUNDING_BOX_ROUNDED_CORNER, IMAGE_SHADER, IMAGE_SHADER_ATLAS_DEFAULT_WRAP, IMAGE_SHADER_ATLAS_CUSTOM_WRAP, -- 2.7.4 From da19b50dbd3bb82ac9bcbbc6dd0e6d601c929c2f Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Tue, 12 May 2020 14:55:59 +0900 Subject: [PATCH 07/16] Add MIN_LINE_SIZE property Users want to set the line size in multi-line. We have a lineSpacing property which allows us to set the spacing of the lines. However, the user wants to achieve a similar effect by setting the size of the line, not lineSpacing. Change-Id: Ia96e1875e90454a3269d2ad853d3c4e20ce66ae9 --- .../src/dali-toolkit/utc-Dali-TextLabel.cpp | 5 +++ .../controls/text-controls/text-label-devel.h | 7 ++++ .../controls/text-controls/text-label-impl.cpp | 24 ++++++++++++- .../internal/text/layouts/layout-engine.cpp | 39 ++++++++++++++++++---- dali-toolkit/internal/text/layouts/layout-engine.h | 14 ++++++++ dali-toolkit/internal/text/text-controller.cpp | 16 +++++++++ dali-toolkit/internal/text/text-controller.h | 16 +++++++++ 7 files changed, 113 insertions(+), 8 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp index 9f9ce5f..2d6b092 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp @@ -637,6 +637,11 @@ int UtcDaliToolkitTextLabelSetPropertyP(void) label.SetProperty( Actor::Property::LAYOUT_DIRECTION, LayoutDirection::RIGHT_TO_LEFT ); DALI_TEST_EQUALS( label.GetProperty< int >( Actor::Property::LAYOUT_DIRECTION ), static_cast< int >( LayoutDirection::RIGHT_TO_LEFT ), TEST_LOCATION ); + // Check the line size property + DALI_TEST_EQUALS( label.GetProperty( DevelTextLabel::Property::MIN_LINE_SIZE ), 0.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + label.SetProperty( DevelTextLabel::Property::MIN_LINE_SIZE, 50.f ); + DALI_TEST_EQUALS( label.GetProperty( DevelTextLabel::Property::MIN_LINE_SIZE ), 50.0f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + application.SendNotification(); application.Render(); diff --git a/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h index 72ad6f8..9190441 100755 --- a/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h @@ -140,6 +140,13 @@ namespace Property */ TEXT_FIT, + /** + * @brief Sets the height of the line in points. + * @details Name "lineSize", type Property::FLOAT. + * @note If the font size is larger than the line size, it works with the font size. + */ + MIN_LINE_SIZE, + }; } // namespace Property diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp index c521817..2fddac3 100755 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp @@ -140,7 +140,8 @@ DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextLabel, "verticalLineAlignment DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextLabel, "textBackground", MAP, BACKGROUND ) DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextLabel, "ignoreSpacesAfterText", BOOLEAN, IGNORE_SPACES_AFTER_TEXT ) DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextLabel, "matchSystemLanguageDirection", BOOLEAN, MATCH_SYSTEM_LANGUAGE_DIRECTION ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextLabel, "textFit", MAP, TEXT_FIT ) +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextLabel, "textFit", MAP, TEXT_FIT ) +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextLabel, "minLineSize", FLOAT, MIN_LINE_SIZE ) DALI_ANIMATABLE_PROPERTY_REGISTRATION_WITH_DEFAULT( Toolkit, TextLabel, "textColor", Color::BLACK, TEXT_COLOR ) DALI_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION( Toolkit, TextLabel, "textColorRed", TEXT_COLOR_RED, TEXT_COLOR, 0 ) DALI_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION( Toolkit, TextLabel, "textColorGreen", TEXT_COLOR_GREEN, TEXT_COLOR, 1 ) @@ -553,6 +554,19 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } + case Toolkit::DevelTextLabel::Property::MIN_LINE_SIZE: + { + if( impl.mController ) + { + const float lineSize = value.Get(); + + if( impl.mController->SetDefaultLineSize( lineSize ) ) + { + impl.mTextUpdateNeeded = true; + } + } + break; + } } // Request relayout when text update is needed. It's necessary to call it @@ -834,6 +848,14 @@ Property::Value TextLabel::GetProperty( BaseObject* object, Property::Index inde value = map; break; } + case Toolkit::DevelTextLabel::Property::MIN_LINE_SIZE: + { + if( impl.mController ) + { + value = impl.mController->GetDefaultLineSize(); + } + break; + } } } diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp index e91ebae..fb63d96 100755 --- a/dali-toolkit/internal/text/layouts/layout-engine.cpp +++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp @@ -52,7 +52,8 @@ namespace const float MAX_FLOAT = std::numeric_limits::max(); const CharacterDirection LTR = false; const CharacterDirection RTL = !LTR; -const float LINE_SPACING= 0.f; +const float LINE_SPACING = 0.f; +const float MIN_LINE_SIZE = 0.f; inline bool isEmptyLineAtLast( const Vector& lines, const Vector::Iterator& line ) { @@ -130,7 +131,8 @@ struct Engine::Impl Impl() : mLayout{ Layout::Engine::SINGLE_LINE_BOX }, mCursorWidth{ 0.f }, - mDefaultLineSpacing{ LINE_SPACING } + mDefaultLineSpacing{ LINE_SPACING }, + mDefaultLineSize{ MIN_LINE_SIZE } { } @@ -162,8 +164,12 @@ struct Engine::Impl // Sets the minimum descender. lineLayout.descender = std::min( lineLayout.descender, fontMetrics.descender ); - // set the line spacing - lineLayout.lineSpacing = mDefaultLineSpacing; + // Sets the line size + lineLayout.lineSpacing = mDefaultLineSize - ( lineLayout.ascender + -lineLayout.descender ); + lineLayout.lineSpacing = lineLayout.lineSpacing < 0.f ? 0.f : lineLayout.lineSpacing; + + // Add the line spacing + lineLayout.lineSpacing += mDefaultLineSpacing; } /** @@ -921,8 +927,6 @@ struct Engine::Impl lineRun.glyphRun.numberOfGlyphs = layout.numberOfGlyphs; lineRun.characterRun.characterIndex = layout.characterIndex; lineRun.characterRun.numberOfCharacters = layout.numberOfCharacters; - lineRun.lineSpacing = mDefaultLineSpacing; - lineRun.width = layout.length; lineRun.extraLength = std::ceil( layout.whiteSpaceLengthEndOfLine ); @@ -935,6 +939,12 @@ struct Engine::Impl lineRun.direction = layout.direction; lineRun.ellipsis = false; + lineRun.lineSpacing = mDefaultLineSize - ( lineRun.ascender + -lineRun.descender ); + lineRun.lineSpacing = lineRun.lineSpacing < 0.f ? 0.f : lineRun.lineSpacing; + + lineRun.lineSpacing += mDefaultLineSpacing; + + // Update the actual size. if( lineRun.width > layoutSize.width ) { @@ -986,7 +996,11 @@ struct Engine::Impl lineRun.alignmentOffset = 0.f; lineRun.direction = LTR; lineRun.ellipsis = false; - lineRun.lineSpacing = mDefaultLineSpacing; + + lineRun.lineSpacing = mDefaultLineSize - ( lineRun.ascender + -lineRun.descender ); + lineRun.lineSpacing = lineRun.lineSpacing < 0.f ? 0.f : lineRun.lineSpacing; + + lineRun.lineSpacing += mDefaultLineSpacing; layoutSize.height += ( lineRun.ascender + -lineRun.descender ) + lineRun.lineSpacing; } @@ -1551,6 +1565,7 @@ struct Engine::Impl Type mLayout; float mCursorWidth; float mDefaultLineSpacing; + float mDefaultLineSize; IntrusivePtr mMetrics; }; @@ -1632,6 +1647,16 @@ float Engine::GetDefaultLineSpacing() const return mImpl->mDefaultLineSpacing; } +void Engine::SetDefaultLineSize( float lineSize ) +{ + mImpl->mDefaultLineSize = lineSize; +} + +float Engine::GetDefaultLineSize() const +{ + return mImpl->mDefaultLineSize; +} + } // namespace Layout } // namespace Text diff --git a/dali-toolkit/internal/text/layouts/layout-engine.h b/dali-toolkit/internal/text/layouts/layout-engine.h index af693da..5641c47 100755 --- a/dali-toolkit/internal/text/layouts/layout-engine.h +++ b/dali-toolkit/internal/text/layouts/layout-engine.h @@ -152,6 +152,20 @@ public: */ float GetDefaultLineSpacing() const; + /** + * @brief Sets the default line size. + * + * @param[in] lineSize The line size. + */ + void SetDefaultLineSize( float lineSize ); + + /** + * @brief Retrieves the default line size. + * + * @return The line size. + */ + float GetDefaultLineSize() const; + private: // Undefined diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 9a46e8b..cb09223 100755 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -1462,6 +1462,22 @@ float Controller::GetDefaultLineSpacing() const return mImpl->mLayoutEngine.GetDefaultLineSpacing(); } +bool Controller::SetDefaultLineSize( float lineSize ) +{ + if( std::fabs( lineSize - mImpl->mLayoutEngine.GetDefaultLineSize() ) > Math::MACHINE_EPSILON_1000 ) + { + mImpl->mLayoutEngine.SetDefaultLineSize(lineSize); + mImpl->mRecalculateNaturalSize = true; + return true; + } + return false; +} + +float Controller::GetDefaultLineSize() const +{ + return mImpl->mLayoutEngine.GetDefaultLineSize(); +} + void Controller::SetInputColor( const Vector4& color ) { if( NULL != mImpl->mEventData ) diff --git a/dali-toolkit/internal/text/text-controller.h b/dali-toolkit/internal/text/text-controller.h index 6a986f5..c7a549e 100755 --- a/dali-toolkit/internal/text/text-controller.h +++ b/dali-toolkit/internal/text/text-controller.h @@ -1055,6 +1055,22 @@ public: // Default style & Input style float GetDefaultLineSpacing() const; /** + * @brief Sets the default line size. + * + * @param[in] lineSize The line size. + * + * @return True if lineSize has been updated, false otherwise + */ + bool SetDefaultLineSize( float lineSize ); + + /** + * @brief Retrieves the default line size. + * + * @return The line size. + */ + float GetDefaultLineSize() const; + + /** * @brief Sets the input text's color. * * @param[in] color The input text's color. -- 2.7.4 From da14264ab4898d0954af273b9825c83f247619e5 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Tue, 19 May 2020 11:35:07 +0900 Subject: [PATCH 08/16] DALi Version 1.5.12 Change-Id: I0a2237606b86b946d483bc3c1dad4183abb62ee7 --- dali-toolkit/public-api/dali-toolkit-version.cpp | 2 +- packaging/dali-toolkit.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index 340d5e9..09aa72d 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -31,7 +31,7 @@ namespace Toolkit const unsigned int TOOLKIT_MAJOR_VERSION = 1; const unsigned int TOOLKIT_MINOR_VERSION = 5; -const unsigned int TOOLKIT_MICRO_VERSION = 11; +const unsigned int TOOLKIT_MICRO_VERSION = 12; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 5ba4e12..7d2896f 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali-toolkit Summary: Dali 3D engine Toolkit -Version: 1.5.11 +Version: 1.5.12 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT -- 2.7.4 From e5fee652f4d88f2c40fba57c9036fc8717b5ebaa Mon Sep 17 00:00:00 2001 From: ali198724 Date: Mon, 11 May 2020 19:17:46 +0300 Subject: [PATCH 09/16] Textfield: remove duplicated functionality Getting selected text is done using property no need for special get function Change-Id: I8b0cbcce414d4ac229eef20860929a394ab40126 --- dali-toolkit/devel-api/controls/text-controls/text-field-devel.h | 8 -------- dali-toolkit/internal/controls/text-controls/text-field-impl.h | 6 ------ 2 files changed, 14 deletions(-) diff --git a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h index 0d10779..042841f 100755 --- a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h @@ -157,14 +157,6 @@ DALI_TOOLKIT_API void SelectWholeText( TextField textField ); */ DALI_TOOLKIT_API void SelectNone( TextField textField ); -/** - * @brief Get the selected text of TextField. - * - * @param[in] textField The instance of TextField. - * @return Selected text in the TextField. - */ -DALI_TOOLKIT_API std::string SelectedText( TextField textField ); - } // namespace DevelText } // namespace Toolkit diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.h b/dali-toolkit/internal/controls/text-controls/text-field-impl.h index 3fd32a0..2991931 100755 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h @@ -112,12 +112,6 @@ public: */ void SelectNone(); - /** - * @brief Called to get selected text. - * @return Selected text in the TextField. - */ - std::string SelectedText(); - private: // From Control /** -- 2.7.4 From 3c63b251f2cc04e02842fea0f9eb5baba9cb4fb4 Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Tue, 19 May 2020 13:50:25 +0100 Subject: [PATCH 10/16] Change to use properties instead of Setter/Getter APIs of Dali::Actor Change-Id: Ia3ba6418b6b7d1ec66b126892bd8337767f9d393 --- .../utc-Dali-TextField-internal.cpp | 8 +- .../dali-toolkit/utc-Dali-AccessibilityManager.cpp | 12 +- .../src/dali-toolkit/utc-Dali-Alignment.cpp | 2 +- .../utc-Dali-AnimatedVectorImageVisual.cpp | 4 +- .../src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp | 1 + .../src/dali-toolkit/utc-Dali-BloomView.cpp | 6 +- .../src/dali-toolkit/utc-Dali-BubbleEmitter.cpp | 8 +- .../src/dali-toolkit/utc-Dali-Builder.cpp | 18 +- .../src/dali-toolkit/utc-Dali-Button.cpp | 28 +-- .../dali-toolkit/utc-Dali-ConfirmationPopup.cpp | 6 +- .../src/dali-toolkit/utc-Dali-ControlImpl.cpp | 22 +-- .../src/dali-toolkit/utc-Dali-ControlWrapper.cpp | 6 +- .../dali-toolkit/utc-Dali-CubeTransitionEffect.cpp | 176 +++++++++---------- .../dali-toolkit/utc-Dali-DragAndDropDetector.cpp | 58 +++---- .../src/dali-toolkit/utc-Dali-EffectsView.cpp | 10 +- .../src/dali-toolkit/utc-Dali-FlexNode.cpp | 12 +- .../src/dali-toolkit/utc-Dali-GaussianBlurView.cpp | 10 +- .../src/dali-toolkit/utc-Dali-ImageView.cpp | 34 ++-- .../src/dali-toolkit/utc-Dali-ImageVisual.cpp | 26 +-- .../src/dali-toolkit/utc-Dali-ItemView.cpp | 16 +- .../src/dali-toolkit/utc-Dali-Magnifier.cpp | 2 +- .../src/dali-toolkit/utc-Dali-Model3dView.cpp | 4 +- .../src/dali-toolkit/utc-Dali-NavigationView.cpp | 24 +-- .../src/dali-toolkit/utc-Dali-PageTurnView.cpp | 6 +- .../src/dali-toolkit/utc-Dali-Popup.cpp | 53 +++--- .../src/dali-toolkit/utc-Dali-ProgressBar.cpp | 17 +- .../src/dali-toolkit/utc-Dali-PushButton.cpp | 32 ++-- .../src/dali-toolkit/utc-Dali-RadioButton.cpp | 16 +- .../src/dali-toolkit/utc-Dali-ScrollBar.cpp | 161 +++++++++--------- .../src/dali-toolkit/utc-Dali-ScrollView.cpp | 80 ++++----- .../src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp | 14 +- .../src/dali-toolkit/utc-Dali-ShadowView.cpp | 4 +- .../src/dali-toolkit/utc-Dali-Slider.cpp | 12 +- .../src/dali-toolkit/utc-Dali-TableView.cpp | 188 ++++++++++----------- .../src/dali-toolkit/utc-Dali-TextEditor.cpp | 80 ++++----- .../src/dali-toolkit/utc-Dali-TextField.cpp | 112 ++++++------ .../src/dali-toolkit/utc-Dali-TextLabel.cpp | 8 +- .../dali-toolkit/utc-Dali-TextSelectionPopup.cpp | 6 +- .../utc-Dali-TextSelectionPopupMirroringLTR.cpp | 6 +- .../utc-Dali-TextSelectionPopupMirroringRTL.cpp | 6 +- .../src/dali-toolkit/utc-Dali-ToggleButton.cpp | 12 +- .../src/dali-toolkit/utc-Dali-Tooltip.cpp | 76 ++++----- .../src/dali-toolkit/utc-Dali-TransitionData.cpp | 74 ++++---- .../src/dali-toolkit/utc-Dali-VideoView.cpp | 4 +- .../src/dali-toolkit/utc-Dali-Visual.cpp | 43 ++--- .../src/dali-toolkit/utc-Dali-VisualFactory.cpp | 2 +- .../src/dali-toolkit/utc-Dali-WebView.cpp | 8 +- dali-toolkit/devel-api/builder/builder.h | 4 +- .../devel-api/controls/effects-view/effects-view.h | 2 +- .../devel-api/controls/shadow-view/shadow-view.h | 8 +- dali-toolkit/devel-api/layouting/flex-node.cpp | 10 +- .../accessibility-manager-impl.cpp | 14 +- dali-toolkit/internal/builder/builder-signals.cpp | 4 +- .../internal/controls/alignment/alignment-impl.cpp | 4 +- .../controls/bloom-view/bloom-view-impl.cpp | 20 +-- .../controls/bubble-effect/bubble-emitter-impl.cpp | 4 +- .../internal/controls/buttons/push-button-impl.cpp | 2 +- .../controls/buttons/toggle-button-impl.cpp | 2 +- .../internal/controls/control/control-debug.cpp | 4 +- .../controls/effects-view/effects-view-impl.cpp | 4 +- .../flex-container/flex-container-impl.cpp | 14 +- .../gaussian-blur-view/gaussian-blur-view-impl.cpp | 19 ++- .../internal/controls/magnifier/magnifier-impl.cpp | 8 +- .../navigation-view/navigation-view-impl.cpp | 2 +- .../page-turn-landscape-view-impl.cpp | 4 +- .../page-turn-portrait-view-impl.cpp | 6 +- .../page-turn-view/page-turn-view-impl.cpp | 36 ++-- .../internal/controls/popup/popup-impl.cpp | 77 ++++----- .../internal/controls/scene3d-view/gltf-loader.cpp | 14 +- .../controls/scene3d-view/scene3d-view-impl.cpp | 16 +- .../controls/scroll-bar/scroll-bar-impl.cpp | 19 ++- .../controls/scrollable/bouncing-effect-actor.h | 4 +- .../scrollable/item-view/item-view-impl.cpp | 50 +++--- .../scroll-overshoot-indicator-impl.cpp | 26 +-- .../scrollable/scroll-view/scroll-view-impl.cpp | 26 +-- .../controls/shadow-view/shadow-view-impl.cpp | 22 +-- .../internal/controls/slider/slider-impl.cpp | 68 ++++---- .../super-blur-view/super-blur-view-impl.cpp | 2 +- .../controls/table-view/table-view-impl.cpp | 6 +- .../controls/text-controls/text-editor-impl.cpp | 14 +- .../controls/text-controls/text-field-impl.cpp | 10 +- .../text-controls/text-selection-popup-impl.cpp | 8 +- .../text-controls/text-selection-toolbar-impl.cpp | 32 ++-- .../internal/controls/tool-bar/tool-bar-impl.cpp | 4 +- dali-toolkit/internal/controls/tooltip/tooltip.cpp | 12 +- .../controls/video-view/video-view-impl.cpp | 4 +- .../drag-and-drop-detector-impl.cpp | 6 +- .../internal/filters/blur-two-pass-filter.cpp | 6 +- dali-toolkit/internal/filters/emboss-filter.cpp | 8 +- dali-toolkit/internal/filters/image-filter.cpp | 2 +- dali-toolkit/internal/filters/spread-filter.cpp | 4 +- .../focus-manager/keyboard-focus-manager-impl.cpp | 4 +- .../internal/text/decorator/text-decorator.cpp | 104 ++++++------ .../text/rendering/atlas/text-atlas-renderer.cpp | 12 +- .../vector-based/vector-based-renderer.cpp | 6 +- .../internal/text/text-controller-impl.cpp | 6 +- .../cube-transition-cross-effect-impl.cpp | 4 +- .../cube-transition-effect-impl.cpp | 26 +-- .../cube-transition-fold-effect-impl.cpp | 2 +- .../cube-transition-wave-effect-impl.cpp | 2 +- .../animated-vector-image-visual.cpp | 2 +- .../public-api/controls/buttons/check-box-button.h | 2 +- .../public-api/controls/buttons/push-button.h | 2 +- .../public-api/controls/buttons/radio-button.h | 2 +- dali-toolkit/public-api/controls/control-impl.cpp | 4 +- .../controls/scrollable/scroll-view/scroll-view.h | 2 +- docs/content/example-code/properties.cpp | 4 +- .../animation-multi-threading-notes.h | 8 +- docs/content/programming-guide/event-system.h | 2 +- docs/content/programming-guide/flex-container.md | 18 +- docs/content/programming-guide/hello-world.h | 2 +- docs/content/programming-guide/item-view.md | 2 +- docs/content/programming-guide/layer.md | 2 +- .../content/programming-guide/multi-touch-guide.md | 6 +- docs/content/programming-guide/popup.md | 8 +- .../programming-guide/programming-languages.md | 2 +- docs/content/programming-guide/size-negotiation.h | 4 +- docs/content/programming-guide/text-label.md | 12 +- 118 files changed, 1191 insertions(+), 1183 deletions(-) diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextField-internal.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextField-internal.cpp index 5ac4ab1..0d6b83a 100755 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextField-internal.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextField-internal.cpp @@ -37,8 +37,8 @@ int UtcDaliTextFieldMultipleBackgroundText(void) // Create a text field TextField textField = TextField::New(); textField.SetSize( 400.f, 60.f ); - textField.SetParentOrigin( ParentOrigin::TOP_LEFT ); - textField.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + textField.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + textField.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Add the text field to the stage Stage::GetCurrent().Add( textField ); @@ -86,7 +86,7 @@ int UtcDaliTextFieldMultipleBackgroundText(void) // Check that the background is created Actor backgroundActor = renderableActor.GetChildAt( 0u ); DALI_TEST_CHECK( backgroundActor ); - DALI_TEST_CHECK( backgroundActor.GetName() == "TextBackgroundColorActor" ); + DALI_TEST_CHECK( backgroundActor.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "TextBackgroundColorActor" ); // Change the text to contain more characters controller->SetText( "Text Multiple Background Test" ); @@ -108,7 +108,7 @@ int UtcDaliTextFieldMultipleBackgroundText(void) // The background should now be lowered below the highlight backgroundActor = stencil.GetChildAt( 0u ); DALI_TEST_CHECK( backgroundActor ); - DALI_TEST_CHECK( backgroundActor.GetName() == "TextBackgroundColorActor" ); + DALI_TEST_CHECK( backgroundActor.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "TextBackgroundColorActor" ); END_TEST; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp index dbbbd84..06967cf 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp @@ -359,7 +359,7 @@ int UtcDaliAccessibilityManagerSetAndGetCurrentFocusActor(void) Stage::GetCurrent().Add(third); // make the third actor invisible - third.SetVisible(false); + third.SetProperty( Actor::Property::VISIBLE,false); // flush the queue and render once application.SendNotification(); application.Render(); @@ -368,7 +368,7 @@ int UtcDaliAccessibilityManagerSetAndGetCurrentFocusActor(void) DALI_TEST_CHECK(manager.SetCurrentFocusActor(third) == false); // Make the third actor visible - third.SetVisible(true); + third.SetProperty( Actor::Property::VISIBLE,true); // flush the queue and render once application.SendNotification(); application.Render(); @@ -631,7 +631,7 @@ int UtcDaliAccessibilityManagerMoveFocusForward(void) DALI_TEST_CHECK(manager.GetAccessibilityAttribute(manager.GetCurrentFocusActor(), AccessibilityManager::ACCESSIBILITY_LABEL) == "third"); // Make the first actor invisible - first.SetVisible(false); + first.SetProperty( Actor::Property::VISIBLE,false); // flush the queue and render once application.SendNotification(); application.Render(); @@ -644,7 +644,7 @@ int UtcDaliAccessibilityManagerMoveFocusForward(void) DALI_TEST_CHECK(manager.GetAccessibilityAttribute(manager.GetCurrentFocusActor(), AccessibilityManager::ACCESSIBILITY_LABEL) == "third"); // Make the third actor invisible so that no actor can be focused. - third.SetVisible(false); + third.SetProperty( Actor::Property::VISIBLE,false); // flush the queue and render once application.SendNotification(); application.Render(); @@ -748,7 +748,7 @@ int UtcDaliAccessibilityManagerMoveFocusBackward(void) DALI_TEST_CHECK(manager.GetAccessibilityAttribute(manager.GetCurrentFocusActor(), AccessibilityManager::ACCESSIBILITY_LABEL) == "first"); // Make the third actor invisible - third.SetVisible(false); + third.SetProperty( Actor::Property::VISIBLE,false); // flush the queue and render once application.SendNotification(); application.Render(); @@ -761,7 +761,7 @@ int UtcDaliAccessibilityManagerMoveFocusBackward(void) DALI_TEST_CHECK(manager.GetAccessibilityAttribute(manager.GetCurrentFocusActor(), AccessibilityManager::ACCESSIBILITY_LABEL) == "first"); // Make the first actor invisible so that no actor can be focused. - first.SetVisible(false); + first.SetProperty( Actor::Property::VISIBLE,false); // flush the queue and render once application.SendNotification(); application.Render(); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp index fc015f1..f3106c2 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp @@ -967,7 +967,7 @@ int UtcDaliAlignmentOnTouchEvent(void) Alignment alignment = Alignment::New(); alignment.SetSize(100.0f, 100.0f); - alignment.SetAnchorPoint(AnchorPoint::TOP_LEFT); + alignment.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(alignment); alignment.TouchSignal().Connect(&TouchCallback); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp index 069a644..1ba413a 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp @@ -477,7 +477,7 @@ int UtcDaliAnimatedVectorImageVisualCustomShader(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummy.SetSize( 200.f, 200.f ); - dummy.SetParentOrigin( ParentOrigin::CENTER ); + dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( dummy ); application.SendNotification(); @@ -1359,7 +1359,7 @@ int UtcDaliAnimatedVectorImageVisualControlVisibilityChanged(void) DALI_TEST_CHECK( renderer ); DALI_TEST_CHECK( renderer.GetProperty< int >( DevelRenderer::Property::RENDERING_BEHAVIOR ) == DevelRenderer::Rendering::CONTINUOUSLY ); - actor.SetVisible( false ); + actor.SetProperty( Actor::Property::VISIBLE, false ); application.SendNotification(); application.Render(); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp index ac4bcde..7375515 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-AsyncImageLoader.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp index b5a5942..81cbe96 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp @@ -124,7 +124,7 @@ int UtcDaliBloomViewAddRemove(void) DALI_TEST_CHECK( !actor.OnStage() ); - view.SetParentOrigin(ParentOrigin::CENTER); + view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); view.SetSize(Stage::GetCurrent().GetSize()); view.Add(actor); Stage::GetCurrent().Add(view); @@ -149,7 +149,7 @@ int UtcDaliBloomActivateDeactivate(void) RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); DALI_TEST_CHECK( 1u == taskList.GetTaskCount() ); - view.SetParentOrigin(ParentOrigin::CENTER); + view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); view.SetSize(Stage::GetCurrent().GetSize()); view.Add(Actor::New()); Stage::GetCurrent().Add(view); @@ -220,7 +220,7 @@ int UtcDaliBloomOnSizeSet(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( view.GetCurrentSize(), size, TEST_LOCATION ); + DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), size, TEST_LOCATION ); END_TEST; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp index e8f0d98..720136f 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp @@ -199,8 +199,8 @@ int UtcDaliBubbleEmitterSetBubbleScale(void) Actor root = emitter.GetRootActor(); Stage::GetCurrent().Add( root ); root.SetPosition( Vector3::ZERO ); - root.SetParentOrigin( ParentOrigin::CENTER ); - root.SetAnchorPoint( AnchorPoint::CENTER ); + root.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + root.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -322,8 +322,8 @@ int UtcDaliBubbleEmitterRestore(void) Actor root = emitter.GetRootActor(); Stage::GetCurrent().Add( root ); root.SetPosition( Vector3::ZERO ); - root.SetParentOrigin( ParentOrigin::CENTER ); - root.SetAnchorPoint( AnchorPoint::CENTER ); + root.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + root.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); Renderer renderer = root.GetRendererAt( 0 ); DALI_TEST_CHECK( renderer ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp index 41c7153..7a5fa3e 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp @@ -744,7 +744,7 @@ int UtcDaliBuilderChildActionP(void) Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor"); DALI_TEST_CHECK( actor ); - DALI_TEST_CHECK( !actor.IsVisible() ); + DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ); END_TEST; } @@ -801,7 +801,7 @@ int UtcDaliBuilderSetPropertyActionP(void) Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor"); DALI_TEST_CHECK( actor ); - DALI_TEST_CHECK( !actor.IsVisible() ); + DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ); END_TEST; } @@ -855,7 +855,7 @@ int UtcDaliBuilderGenericActionP(void) Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("actor"); DALI_TEST_CHECK( actor ); - DALI_TEST_CHECK( !actor.IsVisible() ); + DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ); END_TEST; } @@ -944,7 +944,7 @@ int UtcDaliBuilderPropertyNotificationP(void) Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("actor"); DALI_TEST_CHECK( actor ); - DALI_TEST_CHECK( actor.IsVisible() ); + DALI_TEST_CHECK( actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ); END_TEST; } @@ -1199,7 +1199,7 @@ int UtcDaliBuilderAddActorsP(void) Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor"); DALI_TEST_CHECK( actor ); - DALI_TEST_CHECK( !actor.IsVisible() ); + DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ); END_TEST; } @@ -1631,10 +1631,10 @@ int UtcDaliBuilderTypeCasts(void) application.Render(); Actor createdActor = rootActor.GetChildAt( 0 ); - DALI_TEST_EQUALS( createdActor.GetMaximumSize(), Vector2(100.0f,15.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( createdActor.GetCurrentPosition(), Vector3(100.0f,10.0f,1.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( createdActor.GetCurrentColor(), Vector4(0.5f,0.5f,0.5f,1.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( createdActor.IsSensitive(), false, TEST_LOCATION ); + DALI_TEST_EQUALS( createdActor.GetProperty< Vector2 >( Actor::Property::MAXIMUM_SIZE ), Vector2(100.0f,15.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( createdActor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(100.0f,10.0f,1.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( createdActor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Vector4(0.5f,0.5f,0.5f,1.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( createdActor.GetProperty< bool >( Actor::Property::SENSITIVE ), false, TEST_LOCATION ); DALI_TEST_EQUALS( createdActor.GetColorMode(), USE_OWN_MULTIPLY_PARENT_COLOR, TEST_LOCATION ); END_TEST; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp index b1c5386..a2b1a81 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp @@ -358,8 +358,8 @@ int UtcDaliButtonAutoRepeatingP(void) const float AUTO_REPEATING_DELAY = 0.15f; Button button = PushButton::New(); - button.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - button.SetParentOrigin( ParentOrigin::TOP_LEFT ); + button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); button.SetPosition( 240, 400 ); button.SetSize( 100, 100 ); Stage::GetCurrent().Add( button ); @@ -588,8 +588,8 @@ int UtcDaliButtonPressedSignalP(void) tet_infoline(" UtcDaliButtonPressedSignalP"); Button button = PushButton::New(); - button.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - button.SetParentOrigin( ParentOrigin::TOP_LEFT ); + button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); button.SetPosition( 240, 400 ); button.SetSize( 100, 100 ); @@ -695,8 +695,8 @@ int UtcDaliButtonClickedSignalP(void) tet_infoline(" UtcDaliButtonClickedSignalP"); Button button = PushButton::New(); - button.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - button.SetParentOrigin( ParentOrigin::TOP_LEFT ); + button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); button.SetPosition( 240, 400 ); button.SetSize( 100, 100 ); @@ -848,14 +848,14 @@ int UtcDaliButtonEventConsumption(void) ToolkitTestApplication application; Button parentButton = PushButton::New(); - parentButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - parentButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); + parentButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + parentButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); parentButton.SetSize( 20, 20 ); Stage::GetCurrent().Add( parentButton ); Button childButton = PushButton::New(); - childButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - childButton.SetParentOrigin( ParentOrigin::BOTTOM_LEFT ); + childButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + childButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_LEFT ); childButton.SetSize( 20, 20 ); parentButton.Add( childButton ); @@ -902,8 +902,8 @@ int UtcDaliButtonRelease(void) ToolkitTestApplication application; Button parentButton = PushButton::New(); - parentButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - parentButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); + parentButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + parentButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); parentButton.SetSize( 20, 20 ); Stage::GetCurrent().Add( parentButton ); parentButton.ReleasedSignal().Connect( &ButtonCallback ); @@ -947,8 +947,8 @@ int UtcDaliButtonMultiTouch(void) Button button = PushButton::New(); button.SetProperty( Button::Property::TOGGLABLE, true); - button.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - button.SetParentOrigin( ParentOrigin::TOP_LEFT ); + button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); button.SetSize( 20, 20 ); Stage::GetCurrent().Add( button ); button.ReleasedSignal().Connect( &ButtonCallback ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp index 9c3765d..0b09c93 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp @@ -163,11 +163,11 @@ int UtcDaliConfirmationPopupDynamicSignalGenerationP(void) // The confirmation popup can use any control type for the ok or cancel buttons. // It requires that the name is "controlOk" to provide the "controlSignalOk" signal. PushButton buttonOK = PushButton::New(); - buttonOK.SetName( "controlOk" ); + buttonOK.SetProperty( Dali::Actor::Property::NAME, "controlOk" ); footerActor.Add( buttonOK ); PushButton buttonCancel = PushButton::New(); - buttonCancel.SetName( "controlCancel" ); + buttonCancel.SetProperty( Dali::Actor::Property::NAME, "controlCancel" ); footerActor.Add( buttonCancel ); popup.SetFooter( footerActor ); @@ -233,7 +233,7 @@ int UtcDaliConfirmationPopupDynamicSignalGenerationN(void) Actor footerActor = Actor::New(); PushButton buttonOK = PushButton::New(); - buttonOK.SetName( "controlOkMisnamed" ); + buttonOK.SetProperty( Dali::Actor::Property::NAME, "controlOkMisnamed" ); popup.SetFooter( buttonOK ); // Tell the confirmation popup to connect to the signal in our button called "onStage". diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp index 31f3094..7779e15 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp @@ -219,7 +219,7 @@ int UtcDaliControlImplOnGestureMethods(void) DummyControl dummy = DummyControl::New(true); dummy.SetSize( Vector2(100.0f, 100.0f ) ); - dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT); + dummy.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(dummy); // Render and notify a couple of times @@ -382,7 +382,7 @@ int UtcDaliControlImplSizeSetP(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( size, dummy.GetCurrentSize().GetVectorXY(), TEST_LOCATION ); + DALI_TEST_EQUALS( size, dummy.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).GetVectorXY(), TEST_LOCATION ); DALI_TEST_EQUALS( dummyImpl.sizeSetCalled, true, TEST_LOCATION ); Stage::GetCurrent().Remove(dummy); @@ -400,7 +400,7 @@ int UtcDaliControlImplSizeSet2P(void) Stage::GetCurrent().Add(dummy); Vector2 size(100.0f, 200.0f); - DALI_TEST_CHECK( size != dummy.GetCurrentSize().GetVectorXY() ); + DALI_TEST_CHECK( size != dummy.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).GetVectorXY() ); application.SendNotification(); application.Render(); @@ -410,7 +410,7 @@ int UtcDaliControlImplSizeSet2P(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS(size, dummy.GetCurrentSize().GetVectorXY(), TEST_LOCATION); + DALI_TEST_EQUALS(size, dummy.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).GetVectorXY(), TEST_LOCATION); Stage::GetCurrent().Remove(dummy); } @@ -474,7 +474,7 @@ int UtcDaliControlImplTouchEvent(void) Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); dummy.SetSize( Vector2( 100.0f, 100.0f ) ); - dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT); + dummy.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(dummy); application.Render(); @@ -500,7 +500,7 @@ int UtcDaliControlImplTouchEvent(void) DummyControl dummy = DummyControl::New(); dummy.SetSize( Vector2( 100.0f, 100.0f ) ); - dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT); + dummy.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(dummy); application.Render(); @@ -530,7 +530,7 @@ int UtcDaliControlImplHoverEvent(void) Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); dummy.SetSize( Vector2( 100.0f, 100.0f ) ); - dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT); + dummy.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(dummy); application.Render(); @@ -556,7 +556,7 @@ int UtcDaliControlImplHoverEvent(void) DummyControl dummy = DummyControl::New(); dummy.SetSize( Vector2( 100.0f, 100.0f ) ); - dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT); + dummy.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(dummy); application.Render(); @@ -727,7 +727,7 @@ int UtcDaliControlImplWheelEvent(void) Impl::DummyControl& dummyImpl = static_cast(dummy.GetImplementation()); dummy.SetSize( Vector2( 100.0f, 100.0f ) ); - dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT); + dummy.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(dummy); dummy.WheelEventSignal().Connect(&WheelEventCallback); @@ -753,7 +753,7 @@ int UtcDaliControlImplWheelEvent(void) DummyControl dummy = DummyControl::New(); dummy.SetSize( Vector2( 100.0f, 100.0f ) ); - dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT); + dummy.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(dummy); dummy.WheelEventSignal().Connect(&WheelEventCallback); @@ -781,7 +781,7 @@ int UtcDaliControlImplSetStyleName(void) DummyControl dummy = DummyControl::New( true ); dummy.SetSize( Vector2( 100.0f, 100.0f ) ); - dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT); + dummy.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(dummy); dummy.SetStyleName("TestStyle"); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp index 0921d61..b46c1fb 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp @@ -633,8 +633,8 @@ int UtcDaliControlWrapperTransitionDataMap1N(void) //DummyControl actor = DummyControl::New(); controlWrapper.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - controlWrapper.SetName("Actor1"); - controlWrapper.SetColor(Color::CYAN); + controlWrapper.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + controlWrapper.SetProperty( Actor::Property::COLOR,Color::CYAN); Stage::GetCurrent().Add(controlWrapper); Animation anim = controlWrapperImpl->CreateTransition( transition ); @@ -838,4 +838,4 @@ int UtcDaliControlWrapperEmitKeyFocusSignal(void) DALI_TEST_CHECK( gKeyInputFocusCallBackCalled ); END_TEST; -} \ No newline at end of file +} diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp index 8d8cefb..1ff061e 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp @@ -454,30 +454,30 @@ int UtcDaliCubeTransitionWaveEffectStartTransition(void) //check the cube rotation value and color values just before the end of different transitions waveEffect.SetTargetTexture( texture ); Wait( application, TRANSITION_BEFORE_END_DURATION ); - DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); waveEffect.SetTargetTexture( texture ); waveEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1); Wait( application, TRANSITION_BEFORE_END_DURATION ); - DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); waveEffect.SetTargetTexture( texture ); waveEffect.StartTransition(false); Wait( application, TRANSITION_BEFORE_END_DURATION ); - DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); waveEffect.SetTargetTexture( texture ); waveEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2); Wait( application, TRANSITION_BEFORE_END_DURATION ); - DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); END_TEST; } @@ -512,36 +512,36 @@ int UtcDaliCubeTransitionCrossEffectStartTransition(void) //check the cube rotation value and color values just before the end of different transitions Wait( application, TRANSITION_BEFORE_END_DURATION ); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); crossEffect.SetTargetTexture( texture ); crossEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1); Wait( application, TRANSITION_BEFORE_END_DURATION ); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); crossEffect.SetTargetTexture( texture ); crossEffect.StartTransition(false); Wait( application, TRANSITION_BEFORE_END_DURATION ); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); crossEffect.SetTargetTexture( texture ); crossEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2); Wait( application, TRANSITION_BEFORE_END_DURATION ); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); END_TEST; } @@ -570,35 +570,35 @@ int UtcDaliCubeTransitionFoldEffectStartTransition(void) //check the cube rotation value and color values just before the end of different transitions Wait( application, TRANSITION_BEFORE_END_DURATION ); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); foldEffect.SetTargetTexture( texture ); foldEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1); Wait( application, TRANSITION_BEFORE_END_DURATION ); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); foldEffect.SetTargetTexture( texture ); foldEffect.StartTransition(false); Wait( application, TRANSITION_BEFORE_END_DURATION ); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(),FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ),FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); foldEffect.SetTargetTexture( texture ); foldEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2); Wait( application, TRANSITION_BEFORE_END_DURATION ); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( -Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION ); END_TEST; } @@ -829,9 +829,9 @@ int UtcDaliCubeTransitionWaveEffectStopTransition(void) waveEffect.StopTransition(); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); waveEffect.SetTargetTexture( firstTexture ); waveEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1); @@ -839,9 +839,9 @@ int UtcDaliCubeTransitionWaveEffectStopTransition(void) waveEffect.StopTransition(); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); waveEffect.SetTargetTexture( secondTexture ); waveEffect.StartTransition(false); @@ -849,9 +849,9 @@ int UtcDaliCubeTransitionWaveEffectStopTransition(void) waveEffect.StopTransition(); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); waveEffect.SetTargetTexture( firstTexture ); waveEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2); @@ -859,9 +859,9 @@ int UtcDaliCubeTransitionWaveEffectStopTransition(void) waveEffect.StopTransition(); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); END_TEST; } @@ -896,10 +896,10 @@ int UtcDaliCubeTransitionCrossEffectStopTransition(void) crossEffect.StopTransition(); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); crossEffect.SetTargetTexture( firstTexture ); crossEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1); @@ -907,10 +907,10 @@ int UtcDaliCubeTransitionCrossEffectStopTransition(void) crossEffect.StopTransition(); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); crossEffect.SetTargetTexture( secondTexture ); crossEffect.StartTransition(false); @@ -918,10 +918,10 @@ int UtcDaliCubeTransitionCrossEffectStopTransition(void) crossEffect.StopTransition(); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); crossEffect.SetTargetTexture( firstTexture ); crossEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2); @@ -929,10 +929,10 @@ int UtcDaliCubeTransitionCrossEffectStopTransition(void) crossEffect.StopTransition(); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); END_TEST; } @@ -967,10 +967,10 @@ int UtcDaliCubeTransitionFoldEffectStopTransition(void) application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); foldEffect.SetTargetTexture( firstTexture ); foldEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1); @@ -978,10 +978,10 @@ int UtcDaliCubeTransitionFoldEffectStopTransition(void) foldEffect.StopTransition(); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); foldEffect.SetTargetTexture( secondTexture ); foldEffect.StartTransition(false); @@ -989,10 +989,10 @@ int UtcDaliCubeTransitionFoldEffectStopTransition(void) foldEffect.StopTransition(); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); foldEffect.SetTargetTexture( firstTexture ); foldEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2); @@ -1000,9 +1000,9 @@ int UtcDaliCubeTransitionFoldEffectStopTransition(void) foldEffect.StopTransition(); application.SendNotification(); application.Render(RENDER_FRAME_INTERVAL); - DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); - DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube1.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion( Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); + DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION ); END_TEST; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DragAndDropDetector.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DragAndDropDetector.cpp index 17686c1..9742cee 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-DragAndDropDetector.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-DragAndDropDetector.cpp @@ -271,7 +271,7 @@ int UtcDaliDragAndDropDetectorStartSignal(void) Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); Control control = Control::New(); control.SetSize(100.0f, 100.0f); - control.SetAnchorPoint(AnchorPoint::TOP_LEFT); + control.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(control); detector.Attach(control); @@ -304,10 +304,10 @@ int UtcDaliDragAndDropDetectorEnteredSignal(void) Control control2 = Control::New(); control1.SetSize(100.0f,100.0f); control2.SetSize(100.0f, 100.0f); - control1.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control2.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control1.SetParentOrigin(ParentOrigin::TOP_LEFT); - control2.SetParentOrigin(ParentOrigin::TOP_LEFT); + control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); control1.SetPosition(0.0f, 0.0f); control2.SetPosition(0.0f, 100.0f); @@ -347,10 +347,10 @@ int UtcDaliDragAndDropDetectorMovedSignal(void) Control control2 = Control::New(); control1.SetSize(100.0f,100.0f); control2.SetSize(100.0f, 100.0f); - control1.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control2.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control1.SetParentOrigin(ParentOrigin::TOP_LEFT); - control2.SetParentOrigin(ParentOrigin::TOP_LEFT); + control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); control1.SetPosition(0.0f, 0.0f); control2.SetPosition(0.0f, 100.0f); @@ -394,15 +394,15 @@ int UtcDaliDragAndDropDetectorExitedSignal(void) Control control2 = Control::New(); control1.SetSize(100.0f,100.0f); control2.SetSize(100.0f, 100.0f); - control1.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control2.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control1.SetParentOrigin(ParentOrigin::TOP_LEFT); - control2.SetParentOrigin(ParentOrigin::TOP_LEFT); + control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); control1.SetPosition(0.0f, 0.0f); control2.SetPosition(0.0f, 100.0f); - control1.SetLeaveRequired(true); - control2.SetLeaveRequired(true); + control1.SetProperty( Actor::Property::LEAVE_REQUIRED,true); + control2.SetProperty( Actor::Property::LEAVE_REQUIRED,true); Stage::GetCurrent().Add(control1); Stage::GetCurrent().Add(control2); @@ -442,10 +442,10 @@ int UtcDaliDragAndDropDetectorDroppedSignal(void) Control control2 = Control::New(); control1.SetSize(100.0f,100.0f); control2.SetSize(100.0f, 100.0f); - control1.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control2.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control1.SetParentOrigin(ParentOrigin::TOP_LEFT); - control2.SetParentOrigin(ParentOrigin::TOP_LEFT); + control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); control1.SetPosition(0.0f, 0.0f); control2.SetPosition(0.0f, 100.0f); @@ -490,10 +490,10 @@ int UtcDaliDragAndDropDetectorEndedSignal(void) Control control2 = Control::New(); control1.SetSize(100.0f,100.0f); control2.SetSize(100.0f, 100.0f); - control1.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control2.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control1.SetParentOrigin(ParentOrigin::TOP_LEFT); - control2.SetParentOrigin(ParentOrigin::TOP_LEFT); + control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); control1.SetPosition(0.0f, 0.0f); control2.SetPosition(0.0f, 100.0f); @@ -528,14 +528,14 @@ int UtcDaliDragAndDropDetectorGetContent(void) Dali::Toolkit::DragAndDropDetector detector = Dali::Toolkit::DragAndDropDetector::New(); Control control1 = Control::New(); Control control2 = Control::New(); - control1.SetName("control1"); - control2.SetName("control2"); + control1.SetProperty( Dali::Actor::Property::NAME,"control1"); + control2.SetProperty( Dali::Actor::Property::NAME,"control2"); control1.SetSize(100.0f,100.0f); control2.SetSize(100.0f, 100.0f); - control1.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control2.SetAnchorPoint(AnchorPoint::TOP_LEFT); - control1.SetParentOrigin(ParentOrigin::TOP_LEFT); - control2.SetParentOrigin(ParentOrigin::TOP_LEFT); + control1.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + control2.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + control1.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + control2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); control1.SetPosition(0.0f, 0.0f); control2.SetPosition(0.0f, 100.0f); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp index d597f7a..0c8a10b 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp @@ -109,7 +109,7 @@ int UtcDaliEffectsViewAddRemoveDropShadow(void) DALI_TEST_CHECK( !actor.OnStage() ); - view.SetParentOrigin(ParentOrigin::CENTER); + view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); view.SetSize(Stage::GetCurrent().GetSize()); view.Add(actor); Stage::GetCurrent().Add(view); @@ -155,7 +155,7 @@ int UtcDaliEffectsViewAddRemoveEmboss(void) actor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); DALI_TEST_CHECK( !actor.OnStage() ); - view.SetParentOrigin(ParentOrigin::CENTER); + view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); view.Add(actor); view.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); @@ -505,7 +505,7 @@ int UtcDaliEffectsViewSizeSet(void) stage.Add( view ); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION ); } { @@ -515,7 +515,7 @@ int UtcDaliEffectsViewSizeSet(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION ); } { @@ -529,7 +529,7 @@ int UtcDaliEffectsViewSizeSet(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION ); } END_TEST; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp b/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp index 31a6bf2..a22f57c 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp @@ -44,7 +44,7 @@ const Flex::SizeTuple ITEM_SIZE_CALLBACK_TEST = Flex::SizeTuple{ 15.0f, 15.0f }; Flex::SizeTuple MeasureChild( Actor child, float width, int measureModeWidth, float height, int measureModeHeight) { Flex::SizeTuple childSize = ITEM_SIZE; - if (child.GetName() == "callbackTest") + if (child.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "callbackTest") { childSize = ITEM_SIZE_CALLBACK_TEST; } @@ -401,8 +401,8 @@ int UtcDaliToolkitFlexNodeRemoveChildP(void) // Create two actors and add them to the parent flex node Actor actor1 = Actor::New(); Actor actor2 = Actor::New(); - actor1.SetName("Actor1"); - actor2.SetName("Actor2"); + actor1.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor2.SetProperty( Dali::Actor::Property::NAME,"Actor2"); DALI_TEST_CHECK( actor1 ); DALI_TEST_CHECK( actor2 ); @@ -444,8 +444,8 @@ int UtcDaliToolkitFlexNodeRemoveAllChildrenP(void) // Create two actors and add them to the parent flex node Actor actor1 = Actor::New(); Actor actor2 = Actor::New(); - actor1.SetName("Actor1"); - actor2.SetName("Actor2"); + actor1.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor2.SetProperty( Dali::Actor::Property::NAME,"Actor2"); DALI_TEST_CHECK( actor1 ); DALI_TEST_CHECK( actor2 ); @@ -534,7 +534,7 @@ int UtcDaliToolkitFlexNodeCallbackTestP(void) Actor actor1 = Actor::New(); Actor actor2 = Actor::New(); - actor1.SetName("callbackTest"); + actor1.SetProperty( Dali::Actor::Property::NAME,"callbackTest"); DALI_TEST_CHECK( actor1 ); DALI_TEST_CHECK( actor2 ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp index 531b94c..0a483a0 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp @@ -145,7 +145,7 @@ int UtcDaliGaussianBlurViewAddRemove(void) DALI_TEST_CHECK( !actor.OnStage() ); - view.SetParentOrigin(ParentOrigin::CENTER); + view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); view.SetSize(Stage::GetCurrent().GetSize()); view.Add(actor); Stage::GetCurrent().Add(view); @@ -170,7 +170,7 @@ int UtcDaliGaussianBlurActivateDeactivate(void) RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); DALI_TEST_CHECK( 1u == taskList.GetTaskCount() ); - view.SetParentOrigin(ParentOrigin::CENTER); + view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); view.SetSize(Stage::GetCurrent().GetSize()); view.Add(Actor::New()); Stage::GetCurrent().Add(view); @@ -213,7 +213,7 @@ int UtcDaliGaussianBlurViewSetGetRenderTarget(void) Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New(5, 1.5f, Pixel::RGB888, 0.5f, 0.5f, true); DALI_TEST_CHECK( view ); - view.SetParentOrigin(ParentOrigin::CENTER); + view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); view.SetSize(Stage::GetCurrent().GetSize()); view.Add(Actor::New()); Stage::GetCurrent().Add(view); @@ -240,7 +240,7 @@ int UtcDaliGaussianBlurViewActivateOnce(void) RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); DALI_TEST_CHECK( 1u == taskList.GetTaskCount() ); - view.SetParentOrigin(ParentOrigin::CENTER); + view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); view.SetSize(Stage::GetCurrent().GetSize()); view.Add(Actor::New()); Stage::GetCurrent().Add(view); @@ -261,7 +261,7 @@ int UtcDaliGaussianBlurViewFinishedSignalN(void) Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New(5, 1.5f, Pixel::RGB888, 0.5f, 0.5f, true); DALI_TEST_CHECK( view ); - view.SetParentOrigin(ParentOrigin::CENTER); + view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); view.SetSize(Stage::GetCurrent().GetSize()); view.Add(Actor::New()); Stage::GetCurrent().Add(view); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp index bd74fdb..d733a8c 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp @@ -645,7 +645,7 @@ int UtcDaliImageViewAsyncLoadingWithoutAltasing(void) // By default, Aysnc loading is used Stage::GetCurrent().Add( imageView ); imageView.SetSize(100, 100); - imageView.SetParentOrigin( ParentOrigin::CENTER ); + imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); @@ -880,8 +880,8 @@ int UtcDaliImageViewSizeWithBackground(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( imageView.GetCurrentSize().width, (float)width, TEST_LOCATION ); - DALI_TEST_EQUALS( imageView.GetCurrentSize().height, (float)height, TEST_LOCATION ); + DALI_TEST_EQUALS( imageView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, (float)width, TEST_LOCATION ); + DALI_TEST_EQUALS( imageView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height, (float)height, TEST_LOCATION ); END_TEST; } @@ -913,8 +913,8 @@ int UtcDaliImageViewSizeWithBackgroundAndImage(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( imageView.GetCurrentSize().width, (float)width, TEST_LOCATION ); - DALI_TEST_EQUALS( imageView.GetCurrentSize().height, (float)height, TEST_LOCATION ); + DALI_TEST_EQUALS( imageView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, (float)width, TEST_LOCATION ); + DALI_TEST_EQUALS( imageView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height, (float)height, TEST_LOCATION ); END_TEST; } @@ -1873,8 +1873,8 @@ int UtcDaliImageViewPaddingProperty(void) imagePropertyMap[ ImageVisual::Property::DESIRED_WIDTH ] = 128; imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128; imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); - imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - imageView.SetParentOrigin( ParentOrigin::TOP_LEFT ); + imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); imageView.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) ); Stage::GetCurrent().Add( imageView ); @@ -1923,8 +1923,8 @@ int UtcDaliImageViewPaddingProperty02(void) imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128; imagePropertyMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO; imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); - imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - imageView.SetParentOrigin( ParentOrigin::TOP_LEFT ); + imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); imageView.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) ); Stage::GetCurrent().Add( imageView ); @@ -1964,8 +1964,8 @@ int UtcDaliImageViewPaddingProperty03(void) imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128; imagePropertyMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO; imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); - imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - imageView.SetParentOrigin( ParentOrigin::TOP_LEFT ); + imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); imageView.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) ); Stage::GetCurrent().Add( imageView ); @@ -2012,8 +2012,8 @@ int UtcDaliImageViewPaddingProperty04(void) imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 128; imagePropertyMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FILL; imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); - imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - imageView.SetParentOrigin( ParentOrigin::TOP_LEFT ); + imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); imageView.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) ); Stage::GetCurrent().Add( imageView ); @@ -2065,8 +2065,8 @@ int UtcDaliImageViewTransformTest01(void) .Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2( 8, 8 ) ) ); imageView.SetProperty( Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); - imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - imageView.SetParentOrigin( ParentOrigin::TOP_LEFT ); + imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); Stage::GetCurrent().Add( imageView ); application.SendNotification(); @@ -2411,8 +2411,8 @@ int UtcDaliImageViewLoadRemoteSVG(void) imageView.SetImage("https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/check.svg"); // Victor. Temporary (or permanent?) update as the url above seems not to work from time to time ... imageView.SetImage("https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/SVG_logo.svg/64px-SVG_logo.svg.png"); - imageView.SetParentOrigin( ParentOrigin::TOP_LEFT ); - imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); imageView.SetSize(300, 300); imageView.SetPosition( Vector3( 150.0f , 150.0f , 0.0f ) ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp index 327d0f0..3b885b8 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp @@ -640,7 +640,7 @@ int UtcDaliImageVisualCustomWrapModePixelArea(void) DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); actor.SetSize(2000, 2000); - actor.SetParentOrigin(ParentOrigin::CENTER); + actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); Stage::GetCurrent().Add( actor ); // loading started @@ -718,7 +718,7 @@ int UtcDaliImageVisualCustomWrapModeNoAtlas(void) DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual ); actor.SetSize(2000, 2000); - actor.SetParentOrigin(ParentOrigin::CENTER); + actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); Stage::GetCurrent().Add( actor ); // loading started @@ -776,8 +776,8 @@ int UtcDaliImageVisualAnimateMixColor(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetSize(2000, 2000); - actor.SetParentOrigin(ParentOrigin::CENTER); - actor.SetColor(Color::BLACK); + actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + actor.SetProperty( Actor::Property::COLOR,Color::BLACK); Stage::GetCurrent().Add(actor); DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); @@ -824,7 +824,7 @@ int UtcDaliImageVisualAnimateMixColor(void) application.Render(2000u); // Halfway point between blue and white - DALI_TEST_EQUALS( actor.GetCurrentColor(), Color::WHITE, TEST_LOCATION ); + DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Color::WHITE, TEST_LOCATION ); DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue( "uColor", Vector4( 1.0f, 1.0f, 1.0f, 0.5f ) ), true, TEST_LOCATION ); DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue( "mixColor", Vector3( TARGET_MIX_COLOR ) ), true, TEST_LOCATION ); @@ -856,8 +856,8 @@ int UtcDaliImageVisualAnimateOpacity(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetSize(2000, 2000); - actor.SetParentOrigin(ParentOrigin::CENTER); - actor.SetColor(Color::BLACK); + actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + actor.SetProperty( Actor::Property::COLOR,Color::BLACK); Stage::GetCurrent().Add(actor); DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); @@ -968,8 +968,8 @@ int UtcDaliImageVisualAnimateOpacity02(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetSize(2000, 2000); - actor.SetParentOrigin(ParentOrigin::CENTER); - actor.SetColor(Color::BLACK); + actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + actor.SetProperty( Actor::Property::COLOR,Color::BLACK); tet_infoline( "Test that the opacity doesn't animate when actor not staged" ); @@ -1055,8 +1055,8 @@ int UtcDaliImageVisualAnimatePixelArea(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetSize(2000, 2000); - actor.SetParentOrigin(ParentOrigin::CENTER); - actor.SetColor(Color::BLACK); + actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + actor.SetProperty( Actor::Property::COLOR,Color::BLACK); Stage::GetCurrent().Add(actor); DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); @@ -2240,7 +2240,7 @@ int UtcDaliImageVisualCustomShader(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummy.SetSize( 200.f, 200.f ); - dummy.SetParentOrigin( ParentOrigin::CENTER ); + dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( dummy ); application.SendNotification(); @@ -2272,7 +2272,7 @@ int UtcDaliImageVisualCustomShader(void) Impl::DummyControl& dummyImpl1 = static_cast< Impl::DummyControl& >( dummy1.GetImplementation() ); dummyImpl1.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual1 ); dummy1.SetSize( 200, 200 ); - dummy1.SetParentOrigin( ParentOrigin::CENTER ); + dummy1.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( dummy1 ); TestGlAbstraction& glAbstraction = application.GetGlAbstraction(); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp index 4891370..6af032c 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp @@ -537,7 +537,7 @@ int UtcDaliItemViewScrollToItem(void) Vector3 vec(480.0f, 800.0f, 0.0f); ItemLayoutPtr layout = DefaultItemLayout::New( DefaultItemLayout::DEPTH ); - view.SetName("view actor"); + view.SetProperty( Dali::Actor::Property::NAME,"view actor"); view.AddLayout(*layout); view.SetSize(vec); @@ -706,7 +706,7 @@ int UtcDaliItemViewInsertItemsP(void) { Actor child = view.GetChildAt( i ); Actor newActor = Actor::New(); - newActor.SetName("Inserted"); + newActor.SetProperty( Dali::Actor::Property::NAME,"Inserted"); insertList.push_back( Item( view.GetItemId(child), newActor ) ); } @@ -727,7 +727,7 @@ int UtcDaliItemViewInsertItemsP(void) { Actor child = view.GetChildAt( i ); - if( child.GetName() == "Inserted" ) + if( child.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "Inserted" ) { removeList.push_back( view.GetItemId(child) ); } @@ -795,7 +795,7 @@ int UtcDaliItemViewReplaceItemsP(void) { Actor child = view.GetItem( i ); Actor newActor = Actor::New(); - newActor.SetName("Replaced"); + newActor.SetProperty( Dali::Actor::Property::NAME,"Replaced"); replaceList.push_back( Item( i, newActor ) ); } @@ -805,8 +805,8 @@ int UtcDaliItemViewReplaceItemsP(void) view.ReplaceItems( replaceList, 0.5f ); } - DALI_TEST_CHECK(view.GetItem(0).GetName() == "Replaced"); - DALI_TEST_CHECK(view.GetItem(8).GetName() == "Replaced"); + DALI_TEST_CHECK(view.GetItem(0).GetProperty< std::string >( Dali::Actor::Property::NAME ) == "Replaced"); + DALI_TEST_CHECK(view.GetItem(8).GetProperty< std::string >( Dali::Actor::Property::NAME ) == "Replaced"); END_TEST; } @@ -857,7 +857,7 @@ int UtcDaliItemViewSetItemsAnchorPointP(void) view.SetItemsAnchorPoint(anchorPoint); DALI_TEST_CHECK(view.GetItemsAnchorPoint() == anchorPoint); - DALI_TEST_CHECK(view.GetItem(0).GetCurrentAnchorPoint() == anchorPoint); + DALI_TEST_CHECK(view.GetItem(0).GetCurrentProperty< Vector3 >( Actor::Property::ANCHOR_POINT ) == anchorPoint); END_TEST; } @@ -882,7 +882,7 @@ int UtcDaliItemViewSetItemsParentOriginP(void) view.SetItemsParentOrigin(parentOrigin); DALI_TEST_CHECK(view.GetItemsParentOrigin() == parentOrigin); - DALI_TEST_CHECK(view.GetItem(0).GetCurrentParentOrigin() == parentOrigin); + DALI_TEST_CHECK(view.GetItem(0).GetCurrentProperty< Vector3 >( Actor::Property::PARENT_ORIGIN ) == parentOrigin); END_TEST; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp index 2771fbd..c8e0774 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp @@ -273,7 +273,7 @@ int UtcDaliMagnifierOnSizeSet(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( view.GetCurrentSize(), size, TEST_LOCATION ); + DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), size, TEST_LOCATION ); END_TEST; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp index 0d699f6..e155ce8 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp @@ -141,7 +141,7 @@ int UtcDaliModelViewAddRemove(void) DALI_TEST_CHECK( !actor.OnStage() ); - view.SetParentOrigin(ParentOrigin::CENTER); + view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); view.SetSize(Stage::GetCurrent().GetSize()); view.Add(actor); Stage::GetCurrent().Add(view); @@ -210,7 +210,7 @@ int UtcDaliModelOnSizeSet(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( view.GetCurrentSize(), size, TEST_LOCATION ); + DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), size, TEST_LOCATION ); END_TEST; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-NavigationView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-NavigationView.cpp index e91b2cc..78165d7 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-NavigationView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-NavigationView.cpp @@ -145,13 +145,13 @@ int UtcDaliNavigationViewPop(void) // 2 Push initial Actor Actor testParentActor1 = Actor::New(); - testParentActor1.SetName("TestParentActor1"); + testParentActor1.SetProperty( Dali::Actor::Property::NAME,"TestParentActor1"); naviView.Push( testParentActor1 ); DALI_TEST_EQUALS( naviView.GetChildCount(), 1 , TEST_LOCATION ); // 3 Push Second Actor which contains a child actor Actor testParentActor2 = Actor::New(); - testParentActor2.SetName("TestParentActor2"); + testParentActor2.SetProperty( Dali::Actor::Property::NAME,"TestParentActor2"); Actor testChildActor1 = Actor::New(); testParentActor2.Add( testChildActor1 ); naviView.Push( testParentActor2 ); @@ -159,7 +159,7 @@ int UtcDaliNavigationViewPop(void) // 4 Pop head actor, it should be TestParentActor2 Actor poppedActor = naviView.Pop(); - DALI_TEST_EQUALS( poppedActor.GetName() , "TestParentActor2", TEST_LOCATION ); + DALI_TEST_EQUALS( poppedActor.GetProperty< std::string >( Dali::Actor::Property::NAME ) , "TestParentActor2", TEST_LOCATION ); // 5 Navigation View child count should be 1 DALI_TEST_EQUALS( naviView.GetChildCount(), 1 , TEST_LOCATION ); @@ -180,31 +180,31 @@ int UtcDaliNavigationViewPushAndPop(void) // 2 Push initial Actor Actor testParentActor1 = Actor::New(); - testParentActor1.SetName("TestParentActor1"); + testParentActor1.SetProperty( Dali::Actor::Property::NAME,"TestParentActor1"); naviView.Push( testParentActor1 ); DALI_TEST_EQUALS( naviView.GetChildCount(), 1 , TEST_LOCATION ); // 3 Push Second Actor which contains a child actor Actor testParentActor2 = Actor::New(); - testParentActor2.SetName("TestParentActor2"); + testParentActor2.SetProperty( Dali::Actor::Property::NAME,"TestParentActor2"); Actor testChildActor1 = Actor::New(); testParentActor2.Add( testChildActor1 ); naviView.Push( testParentActor2 ); // 3 Push third Actor which contains a child actor Actor testParentActor3 = Actor::New(); - testParentActor3.SetName("TestParentActor3"); + testParentActor3.SetProperty( Dali::Actor::Property::NAME,"TestParentActor3"); Actor testChildActor2 = Actor::New(); testParentActor2.Add( testChildActor2 ); naviView.Push( testParentActor3 ); // 4 Pop head actor, it should be TestParentActor3 Actor poppedActor = naviView.Pop(); - DALI_TEST_EQUALS( poppedActor.GetName() , "TestParentActor3", TEST_LOCATION ); + DALI_TEST_EQUALS( poppedActor.GetProperty< std::string >( Dali::Actor::Property::NAME ) , "TestParentActor3", TEST_LOCATION ); // 5 Pop head actor, it should be TestParentActor2 Actor poppedActor2 = naviView.Pop(); - DALI_TEST_EQUALS( poppedActor2.GetName() , "TestParentActor2", TEST_LOCATION ); + DALI_TEST_EQUALS( poppedActor2.GetProperty< std::string >( Dali::Actor::Property::NAME ) , "TestParentActor2", TEST_LOCATION ); END_TEST; @@ -222,20 +222,20 @@ int UtcDaliNavigationViewPreventLastPop(void) // 2 Push initial Actor Actor testParentActor1 = Actor::New(); - testParentActor1.SetName("TestParentActor1"); + testParentActor1.SetProperty( Dali::Actor::Property::NAME,"TestParentActor1"); naviView.Push( testParentActor1 ); DALI_TEST_EQUALS( naviView.GetChildCount(), 1 , TEST_LOCATION ); // 3 Push Second Actor which contains a child actor Actor testParentActor2 = Actor::New(); - testParentActor2.SetName("TestParentActor2"); + testParentActor2.SetProperty( Dali::Actor::Property::NAME,"TestParentActor2"); Actor testChildActor1 = Actor::New(); testParentActor2.Add( testChildActor1 ); naviView.Push( testParentActor2 ); // 4 Pop head actor, it should be TestParentActor2 Actor poppedActor1 = naviView.Pop(); - DALI_TEST_EQUALS( poppedActor1.GetName() , "TestParentActor2", TEST_LOCATION ); + DALI_TEST_EQUALS( poppedActor1.GetProperty< std::string >( Dali::Actor::Property::NAME ) , "TestParentActor2", TEST_LOCATION ); // 5 Try to Pop head actor, Should be empty hence can not get name of Actor @@ -243,7 +243,7 @@ int UtcDaliNavigationViewPreventLastPop(void) try { - const std::string hasNoName = poppedActorEmpty.GetName(); + const std::string hasNoName = poppedActorEmpty.GetProperty< std::string >( Dali::Actor::Property::NAME ); tet_infoline( hasNoName.c_str() ); DALI_TEST_CHECK( false ); // should not get here } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp index 24c5d09..9342992 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp @@ -404,7 +404,7 @@ int UtcDaliPageTurnPortraitViewSignals(void) TestPageFactory factory; Vector2 size = Stage::GetCurrent().GetSize(); PageTurnView portraitView = PageTurnPortraitView::New( factory, size ); - portraitView.SetParentOrigin( ParentOrigin::CENTER ); + portraitView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( portraitView ); // Render and notify @@ -542,7 +542,7 @@ int UtcDaliPageTurnLanscapeViewSignals(void) TestPageFactory factory; Vector2 stageSize = Stage::GetCurrent().GetSize(); PageTurnView landscapeView = PageTurnLandscapeView::New( factory, Vector2(stageSize.x*0.5f, stageSize.x*0.8f) ); - landscapeView.SetParentOrigin( ParentOrigin::CENTER ); + landscapeView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( landscapeView ); // Render and notify @@ -670,7 +670,7 @@ int UtcDaliPageTurnEmptyTextureHandle(void) try { PageTurnView portraitView = PageTurnPortraitView::New( factory, size ); - portraitView.SetParentOrigin( ParentOrigin::CENTER ); + portraitView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( portraitView ); tet_result(TET_FAIL); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp index 882dfa2..31faabb 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -636,8 +637,8 @@ int UtcDaliPopupOnTouchedOutsideSignal(void) // Create the Popup actor Popup popup = Popup::New(); - popup.SetParentOrigin( ParentOrigin::CENTER ); - popup.SetAnchorPoint( ParentOrigin::CENTER ); + popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + popup.SetProperty( Actor::Property::ANCHOR_POINT, ParentOrigin::CENTER ); popup.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS); popup.SetSize( 50.0f, 50.0f ); popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f ); @@ -916,8 +917,8 @@ int UtcDaliPopupPropertyContextualMode(void) // Placement actor to parent the popup from so the popup's contextual position can be relative to it. Actor placement = Actor::New(); - placement.SetParentOrigin( ParentOrigin::CENTER ); - placement.SetAnchorPoint( AnchorPoint::CENTER ); + placement.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + placement.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); placement.SetSize( 1.0f, 1.0f ); placement.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); Stage::GetCurrent().Add( placement ); @@ -946,7 +947,7 @@ int UtcDaliPopupPropertyContextualMode(void) application.Render(); // Check the position of the label within the popup. - DALI_TEST_EQUALS( contentLabel.GetCurrentWorldPosition().GetVectorXY(), offsetValues[i], TEST_LOCATION ); + DALI_TEST_EQUALS( contentLabel.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).GetVectorXY(), offsetValues[i], TEST_LOCATION ); popup.SetDisplayState( Popup::HIDDEN ); application.SendNotification(); @@ -969,20 +970,20 @@ int UtcDaliPopupPropertyBacking(void) Actor backing = popup.FindChildByName( "popupBacking" ); DALI_TEST_CHECK( backing ); - DALI_TEST_EQUALS( backing.GetCurrentOpacity(), 1.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION ); + DALI_TEST_EQUALS( backing.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION ); // Check enabled property. popup.SetDisplayState( Popup::SHOWN ); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( backing.GetCurrentOpacity(), 0.5f, Math::MACHINE_EPSILON_0, TEST_LOCATION ); + DALI_TEST_EQUALS( backing.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.5f, Math::MACHINE_EPSILON_0, TEST_LOCATION ); popup.SetDisplayState( Popup::HIDDEN ); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( backing.GetCurrentOpacity(), 0.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION ); + DALI_TEST_EQUALS( backing.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION ); popup.SetProperty( Popup::Property::BACKING_ENABLED, false ); bool propertyResult; @@ -993,13 +994,13 @@ int UtcDaliPopupPropertyBacking(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( backing.GetCurrentOpacity(), 0.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION ); + DALI_TEST_EQUALS( backing.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION ); popup.SetDisplayState( Popup::HIDDEN ); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( backing.GetCurrentOpacity(), 0.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION ); + DALI_TEST_EQUALS( backing.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION ); // Check color property. popup.SetProperty( Popup::Property::BACKING_ENABLED, true ); @@ -1096,7 +1097,7 @@ int UtcDaliPopupPropertyCustomAnimation(void) } // Test the popup has animated to it's entry-transition destination. - DALI_TEST_EQUALS( popupContainer.GetCurrentWorldPosition(), entryAnimationDestination, 0.1f, TEST_LOCATION ); + DALI_TEST_EQUALS( popupContainer.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ), entryAnimationDestination, 0.1f, TEST_LOCATION ); popup.SetDisplayState( Popup::HIDDEN ); @@ -1106,7 +1107,7 @@ int UtcDaliPopupPropertyCustomAnimation(void) application.Render( RENDER_FRAME_INTERVAL ); } - DALI_TEST_EQUALS( popupContainer.GetCurrentWorldPosition(), exitAnimationDestination, 0.1f, TEST_LOCATION ); + DALI_TEST_EQUALS( popupContainer.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ), exitAnimationDestination, 0.1f, TEST_LOCATION ); END_TEST; } @@ -1128,15 +1129,15 @@ int UtcDaliPopupPropertyTouchTransparent(void) TextLabel content = TextLabel::New( "text" ); popup.SetContent( content ); popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f ); - popup.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - popup.SetParentOrigin( ParentOrigin::TOP_LEFT ); + popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); popup.SetSize( 100, 100 ); popup.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); // Create a button (to go underneath the popup). PushButton button = Toolkit::PushButton::New(); - button.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - button.SetParentOrigin( ParentOrigin::TOP_LEFT ); + button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); button.SetSize( 100, 100 ); button.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); @@ -1199,8 +1200,8 @@ int UtcDaliPopupPropertyTail(void) // Create the Popup actor Popup popup = Popup::New(); - popup.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - popup.SetParentOrigin( ParentOrigin::TOP_LEFT ); + popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); popup.SetSize( 100, 100 ); popup.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); TextLabel content = TextLabel::New( "text" ); @@ -1243,9 +1244,9 @@ int UtcDaliPopupPropertyTail(void) tailActor = popup.FindChildByName( "tailImage" ); DALI_TEST_CHECK( tailActor ); - float baseValX = tailActor.GetCurrentWorldPosition().x; + float baseValX = tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x; - DALI_TEST_GREATER( baseValX, tailActor.GetCurrentWorldPosition().y, TEST_LOCATION ); + DALI_TEST_GREATER( baseValX, tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y, TEST_LOCATION ); popup.SetDisplayState( Popup::HIDDEN ); application.SendNotification(); @@ -1260,8 +1261,8 @@ int UtcDaliPopupPropertyTail(void) tailActor = popup.FindChildByName( "tailImage" ); DALI_TEST_CHECK( tailActor ); - float baseValY = tailActor.GetCurrentWorldPosition().y; - DALI_TEST_GREATER( baseValX, tailActor.GetCurrentWorldPosition().x, TEST_LOCATION ); + float baseValY = tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y; + DALI_TEST_GREATER( baseValX, tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x, TEST_LOCATION ); popup.SetDisplayState( Popup::HIDDEN ); application.SendNotification(); @@ -1275,8 +1276,8 @@ int UtcDaliPopupPropertyTail(void) application.Render(); tailActor = popup.FindChildByName( "tailImage" ); DALI_TEST_CHECK( tailActor ); - DALI_TEST_EQUALS( tailActor.GetCurrentWorldPosition().x, baseValX, TEST_LOCATION ); - DALI_TEST_GREATER( tailActor.GetCurrentWorldPosition().y, baseValY, TEST_LOCATION ); + DALI_TEST_EQUALS( tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x, baseValX, TEST_LOCATION ); + DALI_TEST_GREATER( tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y, baseValY, TEST_LOCATION ); popup.SetDisplayState( Popup::HIDDEN ); application.SendNotification(); @@ -1290,8 +1291,8 @@ int UtcDaliPopupPropertyTail(void) application.Render(); tailActor = popup.FindChildByName( "tailImage" ); DALI_TEST_CHECK( tailActor ); - DALI_TEST_GREATER( tailActor.GetCurrentWorldPosition().x, baseValX, TEST_LOCATION ); - DALI_TEST_EQUALS( tailActor.GetCurrentWorldPosition().y, baseValY, TEST_LOCATION ); + DALI_TEST_GREATER( tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x, baseValX, TEST_LOCATION ); + DALI_TEST_EQUALS( tailActor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y, baseValY, TEST_LOCATION ); popup.SetDisplayState( Popup::HIDDEN ); application.SendNotification(); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp index a43b2c6..cb035cd 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp @@ -17,6 +17,7 @@ #include #include +#include using namespace Dali; using namespace Dali::Toolkit; @@ -122,8 +123,8 @@ int UtcDaliProgressBarSignals(void) // Create the ProgressBar actor ProgressBar progressBar = ProgressBar::New(); Stage::GetCurrent().Add( progressBar ); - progressBar.SetParentOrigin(ParentOrigin::TOP_LEFT); - progressBar.SetAnchorPoint(ParentOrigin::TOP_LEFT); + progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); progressBar.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) ); progressBar.SetPosition( 0.0f, 0.0f ); progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged ); @@ -152,8 +153,8 @@ int UtcDaliProgressBarSetPropertyP(void) tet_infoline( "UtcDaliProgressBarSetPropertyP" ); ProgressBar progressBar = ProgressBar::New(); - progressBar.SetParentOrigin(ParentOrigin::TOP_LEFT); - progressBar.SetAnchorPoint(ParentOrigin::TOP_LEFT); + progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); progressBar.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) ); progressBar.SetPosition( 0.0f, 0.0f ); progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged ); @@ -299,8 +300,8 @@ int UtcDaliProgressBarSetPropertyP1(void) tet_infoline( "UtcDaliProgressBarSetPropertyP1" ); ProgressBar progressBar = ProgressBar::New(); - progressBar.SetParentOrigin(ParentOrigin::TOP_LEFT); - progressBar.SetAnchorPoint(ParentOrigin::TOP_LEFT); + progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); progressBar.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) ); progressBar.SetPosition( 0.0f, 0.0f ); progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged ); @@ -372,8 +373,8 @@ int UtcDaliProgressBarSetPropertyP2(void) tet_infoline( "UtcDaliProgressBarSetPropertyP2" ); ProgressBar progressBar = ProgressBar::New(); - progressBar.SetParentOrigin(ParentOrigin::TOP_LEFT); - progressBar.SetAnchorPoint(ParentOrigin::TOP_LEFT); + progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); progressBar.SetPosition( 0.0f, 0.0f ); progressBar.SetProperty(ProgressBar::Property::LABEL_VISUAL, "test"); progressBar.SetProperty(ProgressBar::Property::INDETERMINATE, true); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp index a013d58..de95e55 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp @@ -133,8 +133,8 @@ Dali::Integration::Point GetPointUpOutside() // Set up the position of the button for the default test events void SetupButtonForTestTouchEvents( ToolkitTestApplication& application, Button& button, bool useDefaultImages ) { - button.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - button.SetParentOrigin( ParentOrigin::TOP_LEFT ); + button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); button.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); if ( useDefaultImages ) { @@ -464,8 +464,8 @@ int UtcDaliPushButtonPressed(void) tet_infoline(" UtcDaliPushButtonPressed"); PushButton pushButton = PushButton::New(); - pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); pushButton.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); @@ -497,8 +497,8 @@ int UtcDaliPushButtonReleased(void) tet_infoline(" UtcDaliPushButtonReleased"); PushButton pushButton = PushButton::New(); - pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); pushButton.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); @@ -580,8 +580,8 @@ int UtcDaliPushButtonSelected(void) tet_infoline(" UtcDaliPushButtonSelected"); PushButton pushButton = PushButton::New(); - pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); pushButton.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); pushButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); @@ -747,8 +747,8 @@ int UtcDaliPushButtonPaddingLayout(void) ImageDimensions testImageSize = Dali::GetClosestImageSize( TEST_IMAGE_ONE ); const Vector2 TEST_IMAGE_SIZE( testImageSize.GetWidth(), testImageSize.GetHeight() ); - pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); pushButton.SetPosition( 0.0f, 0.0f ); pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); @@ -796,8 +796,8 @@ int UtcDaliPushButtonPaddingLayout(void) pushButton.Unparent(); pushButton = PushButton::New(); - pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); pushButton.SetPosition( 0.0f, 0.0f ); pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); @@ -894,8 +894,8 @@ int UtcDaliPushButtonAlignmentLayout(void) PushButton pushButton = PushButton::New(); - pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); pushButton.SetPosition( 0.0f, 0.0f ); pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); @@ -1112,8 +1112,8 @@ int UtcDaliPushButtonSetSelectedVisualN(void) PushButton pushButton = PushButton::New(); - pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - pushButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + pushButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); pushButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); Stage::GetCurrent().Add( pushButton ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp index ce5881c..85c791a 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp @@ -186,8 +186,8 @@ int UtcDaliRadioButtonSelectedProperty(void) // Create the RadioButton actor RadioButton radioButton = RadioButton::New(); Stage::GetCurrent().Add( radioButton ); - radioButton.SetParentOrigin(ParentOrigin::TOP_LEFT); - radioButton.SetAnchorPoint(ParentOrigin::TOP_LEFT); + radioButton.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + radioButton.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); radioButton.SetPosition( 0.0f, 0.0f ); // Default selected @@ -207,19 +207,19 @@ int UtcDaliRadioButtonSelectedProperty(void) // Test selecting radio buttons RadioButton radioButton2 = RadioButton::New( "label" ); - radioButton2.SetParentOrigin(ParentOrigin::TOP_LEFT); - radioButton2.SetAnchorPoint(ParentOrigin::TOP_LEFT); + radioButton2.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + radioButton2.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); radioButton2.SetPosition( 0.0f, 0.0f ); RadioButton radioButton3 = RadioButton::New( "label" ); - radioButton3.SetParentOrigin(ParentOrigin::TOP_LEFT); - radioButton3.SetAnchorPoint(ParentOrigin::TOP_LEFT); + radioButton3.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + radioButton3.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); radioButton3.SetPosition( 0.0f, 40.0f ); Actor radioGroup = Actor::New(); Stage::GetCurrent().Add( radioGroup ); - radioGroup.SetParentOrigin(ParentOrigin::TOP_LEFT); - radioGroup.SetAnchorPoint(ParentOrigin::TOP_LEFT); + radioGroup.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + radioGroup.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); radioGroup.SetPosition( 0.0f, 0.0f ); radioGroup.SetSize( 400.0f, 400.0 ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp index ff46053..9413723 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp @@ -20,6 +20,7 @@ #include #include #include +#include using namespace Dali; using namespace Toolkit; @@ -301,7 +302,7 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) // Check that the indicator size should be: scroll bar size * (scroll bar size / content size). // i.e. The bigger the content size, the smaller the indicator size - float indicatorHeight = indicator.GetCurrentSize().y; + float indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y; DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 500.0f, TEST_LOCATION ); // Decrease the content length @@ -312,11 +313,11 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) application.Render(); // Check that the indicator size is changed accordingly - indicatorHeight = indicator.GetCurrentSize().y; + indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y; DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 250.0f, TEST_LOCATION ); // As scroll position is 0, check that the indicator position should be 0.0f. - float indicatorPosition = indicator.GetCurrentPosition().y; + float indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y; DALI_TEST_EQUALS( indicatorPosition, 0.0f, TEST_LOCATION ); // Set the scroll position to the middle @@ -327,7 +328,7 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) application.Render(); // Check that the indicator should be in the middle of the scroll bar - indicatorPosition = indicator.GetCurrentPosition().y; + indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y; DALI_TEST_EQUALS( indicatorPosition, (scrollBarHeight - indicatorHeight) * 0.5f, TEST_LOCATION ); // Set the scroll position to the maximum @@ -338,7 +339,7 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) application.Render(); // Check that the indicator should be in the end of the scroll bar - indicatorPosition = indicator.GetCurrentPosition().y; + indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y; DALI_TEST_EQUALS( indicatorPosition, scrollBarHeight - indicatorHeight, TEST_LOCATION ); // Increase the maximum scroll position to double @@ -349,7 +350,7 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) application.Render(); // Check that the indicator should be now in the middle of the scroll bar - indicatorPosition = indicator.GetCurrentPosition().y; + indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y; DALI_TEST_EQUALS( indicatorPosition, (scrollBarHeight - indicatorHeight) * 0.5f, TEST_LOCATION ); // Create another source actor @@ -375,11 +376,11 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) application.Render(); // Check that the indicator size is changed accordingly - indicatorHeight = indicator.GetCurrentSize().y; + indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y; DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 400.0f, TEST_LOCATION ); // Check that the indicator position goes back to the beginning of the scroll bar - indicatorPosition = indicator.GetCurrentPosition().y; + indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y; DALI_TEST_EQUALS( indicatorPosition, 0.0f, TEST_LOCATION ); // Set the scroll position to one fifth of the maximum @@ -390,7 +391,7 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) application.Render(); // Check that the indicator should be in one fifth from the beginning of the scroll bar - indicatorPosition = indicator.GetCurrentPosition().y; + indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y; DALI_TEST_EQUALS( indicatorPosition, (scrollBarHeight - indicatorHeight) * 0.2f, TEST_LOCATION ); END_TEST; @@ -514,8 +515,8 @@ int UtcDaliToolkitScrollBarSetScrollPositionIntervalsP(void) ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); DALI_TEST_CHECK( scrollBar ); - scrollBar.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollBar.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); scrollBar.SetSize(20.0f, 800.0f, 0.0f); Stage::GetCurrent().Add( scrollBar ); @@ -730,7 +731,7 @@ int UtcDaliToolkitScrollBarSetIndicatorHeightPolicyP(void) // Check that the indicator size should be: scroll bar size * (scroll bar size / content size). // i.e. The bigger the content size, the smaller the indicator size - float indicatorHeight = indicator.GetCurrentSize().y; + float indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y; DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 500.0f, TEST_LOCATION ); // Set the indicator height to be fixed to 50.0f @@ -745,7 +746,7 @@ int UtcDaliToolkitScrollBarSetIndicatorHeightPolicyP(void) application.Render(); // Check that the indicator size should be 50.0f - indicatorHeight = indicator.GetCurrentSize().y; + indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y; DALI_TEST_EQUALS( indicatorHeight, 50.0f, TEST_LOCATION ); // Set the indicator height to be variable @@ -758,7 +759,7 @@ int UtcDaliToolkitScrollBarSetIndicatorHeightPolicyP(void) application.Render(); // Check that the indicator size should be: scroll bar size * (scroll bar size / content size). - indicatorHeight = indicator.GetCurrentSize().y; + indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y; DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 500.0f, TEST_LOCATION ); END_TEST; @@ -807,7 +808,7 @@ int UtcDaliToolkitScrollBarSetIndicatorFixedHeightP(void) application.Render(); // Check that the indicator size should be 50.0f - DALI_TEST_EQUALS( indicator.GetCurrentSize().y, 50.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y, 50.0f, TEST_LOCATION ); // Set the indicator height to be fixed to 25.0f scrollBar.SetIndicatorFixedHeight(25.0f); @@ -817,7 +818,7 @@ int UtcDaliToolkitScrollBarSetIndicatorFixedHeightP(void) application.Render(); // Check that the indicator size should be 25.0f - DALI_TEST_EQUALS( indicator.GetCurrentSize().y, 25.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y, 25.0f, TEST_LOCATION ); END_TEST; } @@ -863,14 +864,14 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationP(void) DALI_TEST_EQUALS( scrollBar.GetIndicatorShowDuration(), 0.35f, TEST_LOCATION ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Show the indicator scrollBar.ShowIndicator(); @@ -883,21 +884,21 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationP(void) application.Render(); // Check that the indicator is now visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Set the duration to show the indicator to be 0.75 second scrollBar.SetIndicatorShowDuration(0.75); DALI_TEST_EQUALS( scrollBar.GetIndicatorShowDuration(), 0.75f, TEST_LOCATION ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Show the indicator scrollBar.ShowIndicator(); @@ -910,7 +911,7 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationP(void) application.Render(); // Check that the indicator is not fully visible yet - DALI_TEST_CHECK( indicator.GetCurrentOpacity() != 1.0f ); + DALI_TEST_CHECK( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ) != 1.0f ); // Wait for another 0.4 second Wait(application, 400); @@ -920,7 +921,7 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationP(void) application.Render(); // Check that the indicator is now fully visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); END_TEST; } @@ -945,14 +946,14 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationN(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Show the indicator scrollBar.ShowIndicator(); @@ -965,21 +966,21 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationN(void) application.Render(); // Check that the indicator is now visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Now set the duration to show the indicator to be a negative value (which should be ignored and therefore means instant) scrollBar.SetIndicatorShowDuration(-0.25f); DALI_TEST_EQUALS( scrollBar.GetIndicatorShowDuration(), -0.25f, TEST_LOCATION ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Show the indicator scrollBar.ShowIndicator(); @@ -989,7 +990,7 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationN(void) application.Render(); // Check that the indicator becomes instantly visible in the next frame - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); END_TEST; } @@ -1035,14 +1036,14 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationP(void) DALI_TEST_EQUALS( scrollBar.GetIndicatorHideDuration(), 0.15f, TEST_LOCATION ); // Make the indicator visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Hide the indicator scrollBar.HideIndicator(); @@ -1055,21 +1056,21 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationP(void) application.Render(); // Check that the indicator is now invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Set the duration to hide the indicator to be 0.65 second scrollBar.SetIndicatorHideDuration(0.65f); DALI_TEST_EQUALS( scrollBar.GetIndicatorHideDuration(), 0.65f, TEST_LOCATION ); // Make the indicator visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Hide the indicator scrollBar.HideIndicator(); @@ -1082,7 +1083,7 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationP(void) application.Render(); // Check that the indicator is not fully invisible yet - DALI_TEST_CHECK( indicator.GetCurrentOpacity() != 0.0f ); + DALI_TEST_CHECK( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ) != 0.0f ); // Wait for another 0.5 second Wait(application, 500); @@ -1092,7 +1093,7 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationP(void) application.Render(); // Check that the indicator is now fully invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1117,14 +1118,14 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationN(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Hide the indicator scrollBar.HideIndicator(); @@ -1137,21 +1138,21 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationN(void) application.Render(); // Check that the indicator is now invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Now set the duration to hide the indicator to be a negative value (which should be ignored and therefore means instant) scrollBar.SetIndicatorHideDuration(-0.25f); DALI_TEST_EQUALS( scrollBar.GetIndicatorHideDuration(), -0.25f, TEST_LOCATION ); // Make the indicator visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Hide the indicator scrollBar.HideIndicator(); @@ -1161,7 +1162,7 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationN(void) application.Render(); // Check that the indicator becomes instantly invisible in the next frame - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1209,14 +1210,14 @@ int UtcDaliToolkitScrollBarShowIndicatorP(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Show the indicator scrollBar.ShowIndicator(); @@ -1229,7 +1230,7 @@ int UtcDaliToolkitScrollBarShowIndicatorP(void) application.Render(); // Check that the indicator is now visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); END_TEST; } @@ -1248,14 +1249,14 @@ int UtcDaliToolkitScrollBarShowIndicatorN(void) DALI_TEST_CHECK( indicator ); // Make the indicator initially visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is initially visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Get the default duration to show the indicator float duration = scrollBar.GetIndicatorShowDuration(); @@ -1271,7 +1272,7 @@ int UtcDaliToolkitScrollBarShowIndicatorN(void) application.Render(); // Check that the indicator is still visible in the very next frame - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); END_TEST; } @@ -1296,14 +1297,14 @@ int UtcDaliToolkitScrollBarHideIndicatorP(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Hide the indicator scrollBar.HideIndicator(); @@ -1316,7 +1317,7 @@ int UtcDaliToolkitScrollBarHideIndicatorP(void) application.Render(); // Check that the indicator is now invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1335,14 +1336,14 @@ int UtcDaliToolkitScrollBarHideIndicatorN(void) DALI_TEST_CHECK( indicator ); // Make the indicator initially invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is initially invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Get the default duration to hide the indicator float duration = scrollBar.GetIndicatorHideDuration(); @@ -1358,7 +1359,7 @@ int UtcDaliToolkitScrollBarHideIndicatorN(void) application.Render(); // Check that the indicator is still invisible in the very next frame - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1383,14 +1384,14 @@ int UtcDaliToolkitScrollBarActionShowIndicator(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Do the "ShowIndicator" action Property::Map emptyMap; @@ -1404,7 +1405,7 @@ int UtcDaliToolkitScrollBarActionShowIndicator(void) application.Render(); // Check that the indicator is now visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); END_TEST; } @@ -1429,14 +1430,14 @@ int UtcDaliToolkitScrollBarActionHideIndicator(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Do the "HideIndicator" action Property::Map emptyMap; @@ -1450,7 +1451,7 @@ int UtcDaliToolkitScrollBarActionHideIndicator(void) application.Render(); // Check that the indicator is now invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1475,14 +1476,14 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicator(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Do the "ShowIndicator" action Property::Map emptyMap; @@ -1496,7 +1497,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicator(void) application.Render(); // Check that the indicator is now visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Get the default duration to hide the indicator float hideDuration = scrollBar.GetProperty( ScrollBar::Property::INDICATOR_HIDE_DURATION ); @@ -1514,7 +1515,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicator(void) application.Render(); // Check that the indicator is now invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1533,7 +1534,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorImmediate(void) DALI_TEST_CHECK( indicator ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,0.0f); // Don't use a show animation; the indicator should appear immediately scrollBar.SetProperty( ScrollBar::Property::INDICATOR_SHOW_DURATION, 0.0f ); @@ -1556,7 +1557,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorImmediate(void) application.Render(); // Check that the indicator is now visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Get the default duration to hide the indicator float hideDuration = scrollBar.GetProperty( ScrollBar::Property::INDICATOR_HIDE_DURATION ); @@ -1574,7 +1575,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorImmediate(void) application.Render(); // Check that the indicator is now invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1599,14 +1600,14 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorDuringHide(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Hide the indicator scrollBar.HideIndicator(); @@ -1619,7 +1620,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorDuringHide(void) application.Render(); // Check that the indicator is now partially hidden - DALI_TEST_CHECK( indicator.GetCurrentOpacity() < 1.0f ); + DALI_TEST_CHECK( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ) < 1.0f ); // Now interrupt the Hide with a DoAction( "ShowTransientIndicator" ) @@ -1641,7 +1642,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorDuringHide(void) application.Render(); // Check that the indicator is now visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Get the default duration to hide the indicator float hideDuration = scrollBar.GetProperty( ScrollBar::Property::INDICATOR_HIDE_DURATION ); @@ -1659,7 +1660,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorDuringHide(void) application.Render(); // Check that the indicator is now invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( DevelActor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1672,8 +1673,8 @@ int UtcDaliToolkitScrollBarPanFinishedSignalP(void) ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); DALI_TEST_CHECK( scrollBar ); - scrollBar.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollBar.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); scrollBar.SetSize(20.0f, 800.0f, 0.0f); // Set the indicator height to be fixed to 50.0f @@ -1730,8 +1731,8 @@ int UtcDaliToolkitScrollBarPanFinishedSignalN(void) ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); DALI_TEST_CHECK( scrollBar ); - scrollBar.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollBar.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); scrollBar.SetSize(20.0f, 800.0f, 0.0f); // Set the indicator height to be fixed to 50.0f @@ -1797,8 +1798,8 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalP(void) ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); DALI_TEST_CHECK( scrollBar ); - scrollBar.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollBar.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); scrollBar.SetSize(20.0f, 800.0f, 0.0f); Stage::GetCurrent().Add( scrollBar ); @@ -1913,8 +1914,8 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalN(void) ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); DALI_TEST_CHECK( scrollBar ); - scrollBar.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollBar.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); scrollBar.SetSize(20.0f, 800.0f, 0.0f); Stage::GetCurrent().Add( scrollBar ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp index 7b6a1f0..29c22a0 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp @@ -591,8 +591,8 @@ int UtcDaliToolkitScrollModeP1(void) Vector2 viewPageSize( 720.0f, 1280.0f ); scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); scrollView.SetSize( viewPageSize ); - scrollView.SetParentOrigin( ParentOrigin::CENTER ); - scrollView.SetAnchorPoint( AnchorPoint::CENTER ); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); scrollView.SetPosition( 0.0f, 0.0f, 0.0f ); // Position rulers. @@ -648,8 +648,8 @@ int UtcDaliToolkitScrollModeP2(void) Vector2 viewPageSize( 720.0f, 1280.0f ); scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); scrollView.SetSize( viewPageSize ); - scrollView.SetParentOrigin( ParentOrigin::CENTER ); - scrollView.SetAnchorPoint( AnchorPoint::CENTER ); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); scrollView.SetPosition( 0.0f, 0.0f, 0.0f ); // Position rulers. @@ -706,8 +706,8 @@ int UtcDaliToolkitScrollModeP3(void) Vector2 viewPageSize( 720.0f, 1280.0f ); scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); scrollView.SetSize( viewPageSize ); - scrollView.SetParentOrigin( ParentOrigin::CENTER ); - scrollView.SetAnchorPoint( AnchorPoint::CENTER ); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); scrollView.SetPosition( 0.0f, 0.0f, 0.0f ); // Position rulers. @@ -763,8 +763,8 @@ int UtcDaliToolkitScrollModeP4(void) Vector2 viewPageSize( 720.0f, 1280.0f ); scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); scrollView.SetSize( viewPageSize ); - scrollView.SetParentOrigin( ParentOrigin::TOP_LEFT ); - scrollView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); scrollView.SetPosition( 0.0f, 0.0f, 0.0f ); // Position rulers - expect Default rulers to be used which don't snap @@ -1055,8 +1055,8 @@ int UtcDaliToolkitScrollViewSignalsUpdate01(void) Stage::GetCurrent().Add( scrollView ); Vector2 stageSize = Stage::GetCurrent().GetSize(); scrollView.SetSize(stageSize); - scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); // Position rulers. RulerPtr rulerX = new DefaultRuler(); @@ -1071,8 +1071,8 @@ int UtcDaliToolkitScrollViewSignalsUpdate01(void) Actor image = Actor::New(); image.SetSize(stageSize); - image.SetParentOrigin(ParentOrigin::TOP_LEFT); - image.SetAnchorPoint(AnchorPoint::TOP_LEFT); + image.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + image.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); scrollView.Add(image); Wait(application); @@ -1117,8 +1117,8 @@ int UtcDaliToolkitScrollViewSignalsUpdate02(void) Stage::GetCurrent().Add( scrollView ); Vector2 stageSize = Stage::GetCurrent().GetSize(); scrollView.SetSize(stageSize); - scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); // Position rulers. RulerPtr rulerX = new DefaultRuler(); @@ -1137,8 +1137,8 @@ int UtcDaliToolkitScrollViewSignalsUpdate02(void) Actor image = Actor::New(); image.SetSize(stageSize); - image.SetParentOrigin(ParentOrigin::TOP_LEFT); - image.SetAnchorPoint(AnchorPoint::TOP_LEFT); + image.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + image.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); scrollView.Add(image); Wait(application); @@ -1184,8 +1184,8 @@ int UtcDaliToolkitScrollViewScrollSensitive(void) Stage::GetCurrent().Add( scrollView ); Vector2 stageSize = Stage::GetCurrent().GetSize(); scrollView.SetSize(stageSize); - scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); // Position rulers. RulerPtr rulerX = new DefaultRuler(); @@ -1231,8 +1231,8 @@ int UtcDaliToolkitScrollViewAxisAutoLock(void) Stage::GetCurrent().Add( scrollView ); Vector2 stageSize = Stage::GetCurrent().GetSize(); scrollView.SetSize(stageSize); - scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); // Position rulers. RulerPtr rulerX = new DefaultRuler(); @@ -1336,8 +1336,8 @@ int UtcDaliToolkitScrollViewConstraints(void) Stage::GetCurrent().Add( scrollView ); Vector2 stageSize = Stage::GetCurrent().GetSize(); scrollView.SetSize(stageSize); - scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); // Position rulers. RulerPtr rulerX = new DefaultRuler(); @@ -1381,8 +1381,8 @@ int UtcDaliToolkitScrollViewBind(void) Stage::GetCurrent().Add( scrollView ); Vector2 stageSize = Stage::GetCurrent().GetSize(); scrollView.SetSize(stageSize); - scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); // Position rulers. RulerPtr rulerX = new DefaultRuler(); @@ -1442,8 +1442,8 @@ int UtcDaliToolkitScrollViewOvershoot(void) Stage::GetCurrent().Add( scrollView ); Vector2 stageSize = Stage::GetCurrent().GetSize(); scrollView.SetSize(stageSize); - scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); // Position rulers. RulerPtr rulerX = new DefaultRuler(); @@ -1574,8 +1574,8 @@ int UtcDaliToolkitScrollViewSnapStartedSignalP(void) Stage::GetCurrent().Add( scrollView ); Vector2 stageSize = Stage::GetCurrent().GetSize(); scrollView.SetSize(stageSize); - scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); // Position rulers. RulerPtr rulerX = new DefaultRuler(); @@ -1644,8 +1644,8 @@ int UtcDaliToolkitScrollViewSetMaxOvershootP(void) Stage::GetCurrent().Add( scrollView ); Vector2 stageSize = Stage::GetCurrent().GetSize(); scrollView.SetSize(stageSize); - scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); // Position rulers. RulerPtr rulerX = new DefaultRuler(); @@ -1735,8 +1735,8 @@ int UtcDaliToolkitScrollViewSetScrollingDirectionP(void) Stage::GetCurrent().Add( scrollView ); Vector2 stageSize = Stage::GetCurrent().GetSize(); scrollView.SetSize(stageSize); - scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Vector2 START_POSITION = Vector2(10.0f, 10.0f); @@ -1821,8 +1821,8 @@ int UtcDaliToolkitScrollViewRemoveScrollingDirectionP(void) Stage::GetCurrent().Add( scrollView ); Vector2 stageSize = Stage::GetCurrent().GetSize(); scrollView.SetSize(stageSize); - scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); Vector2 START_POSITION = Vector2(10.0f, 10.0f); uint32_t time = 0; @@ -2644,8 +2644,8 @@ int UtcDaliToolkitScrollViewConstraintsMove(void) Stage::GetCurrent().Add( scrollView ); Vector2 stageSize = Stage::GetCurrent().GetSize(); scrollView.SetSize(stageSize); - scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); // Position rulers. RulerPtr rulerX = new DefaultRuler(); @@ -2689,8 +2689,8 @@ int UtcDaliToolkitScrollViewConstraintsWrap(void) Stage::GetCurrent().Add( scrollView ); Vector2 stageSize = Stage::GetCurrent().GetSize(); scrollView.SetSize(stageSize); - scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); // Position rulers. RulerPtr rulerX = new DefaultRuler(); @@ -2745,8 +2745,8 @@ int UtcDaliToolkitScrollViewGesturePageLimit(void) Vector2 viewPageSize( 720.0f, 1280.0f ); scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); scrollView.SetSize( viewPageSize ); - scrollView.SetParentOrigin( ParentOrigin::CENTER ); - scrollView.SetAnchorPoint( AnchorPoint::CENTER ); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); scrollView.SetPosition( 0.0f, 0.0f, 0.0f ); // Position rulers. diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp index f15a256..2933067 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp @@ -138,8 +138,8 @@ ScrollView SetupTestScrollView(int rows, int columns, Vector2 size) ScrollView scrollView = ScrollView::New(); scrollView.SetSize(size); - scrollView.SetAnchorPoint(AnchorPoint::CENTER); - scrollView.SetParentOrigin(ParentOrigin::CENTER); + scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); + scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); constraint = Constraint::New( scrollView, Dali::Actor::Property::SIZE, Dali::EqualToConstraint() ); constraint.AddSource( Dali::ParentSource( Dali::Actor::Property::SIZE ) ); @@ -174,8 +174,8 @@ ScrollView SetupTestScrollView(int rows, int columns, Vector2 size) Stage::GetCurrent().Add( scrollView ); Actor container = Actor::New(); - container.SetParentOrigin(ParentOrigin::CENTER); - container.SetAnchorPoint(AnchorPoint::CENTER); + container.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + container.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); container.SetSize( size ); scrollView.Add( container ); @@ -193,8 +193,8 @@ ScrollView SetupTestScrollView(int rows, int columns, Vector2 size) constraint = Constraint::New( page, Actor::Property::SIZE, EqualToConstraint() ); constraint.AddSource( Dali::ParentSource( Dali::Actor::Property::SIZE ) ); constraint.Apply(); - page.SetParentOrigin( ParentOrigin::CENTER ); - page.SetAnchorPoint( AnchorPoint::CENTER ); + page.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + page.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); page.SetPosition( column * size.x, row * size.y ); container.Add(page); @@ -289,7 +289,7 @@ int UtcDaliScrollViewPagePathEffectTest(void) } // test that the test page has reached centre of screen - Vector3 pagePos = testPage.GetCurrentPosition(); + Vector3 pagePos = testPage.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION); CleanupTest(); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp index 78ff25f..acc3411 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp @@ -118,7 +118,7 @@ int UtcDaliShadowViewAddRemove(void) DALI_TEST_CHECK( !actor.OnStage() ); - view.SetParentOrigin(ParentOrigin::CENTER); + view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); view.SetSize(Stage::GetCurrent().GetSize()); view.Add(actor); Stage::GetCurrent().Add(view); @@ -143,7 +143,7 @@ int UtcDaliShadowViewActivateDeactivate(void) RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); DALI_TEST_CHECK( 1u == taskList.GetTaskCount() ); - view.SetParentOrigin(ParentOrigin::CENTER); + view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); view.SetSize(Stage::GetCurrent().GetSize()); view.Add(Actor::New()); Stage::GetCurrent().Add(view); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp index d7adf0e..74e5ff1 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp @@ -129,8 +129,8 @@ int UtcDaliSliderSignals1(void) // Create the Popup actor Slider slider = Slider::New(); Stage::GetCurrent().Add( slider ); - slider.SetParentOrigin(ParentOrigin::TOP_LEFT); - slider.SetAnchorPoint(ParentOrigin::TOP_LEFT); + slider.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + slider.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) ); slider.SetPosition( 0.0f, 0.0f ); @@ -226,8 +226,8 @@ int UtcDaliSliderSignals2(void) // Create the Popup actor Slider slider = Slider::New(); Stage::GetCurrent().Add( slider ); - slider.SetParentOrigin(ParentOrigin::TOP_LEFT); - slider.SetAnchorPoint(ParentOrigin::TOP_LEFT); + slider.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + slider.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) ); slider.SetPosition( 0.0f, 0.0f ); @@ -289,8 +289,8 @@ int UtcDaliSetPropertyP(void) tet_infoline( "UtcDaliSetPropertyP" ); Slider slider = Slider::New(); - slider.SetParentOrigin(ParentOrigin::TOP_LEFT); - slider.SetAnchorPoint(ParentOrigin::TOP_LEFT); + slider.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + slider.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) ); slider.SetPosition( 0.0f, 0.0f ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp index 3a8ce20..9f599a1 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp @@ -141,9 +141,9 @@ int UtcDaliTableViewMetricsPadding(void) application.Render(); DALI_TEST_EQUALS( tableView.GetCellPadding(), Size(0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor1.GetCurrentPosition(), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2.GetCurrentPosition(), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3.GetCurrentPosition(), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION ); // 1. check that padding works. some padding: tableView.SetCellPadding(Size(5.0f, 10.0f)); @@ -151,7 +151,7 @@ int UtcDaliTableViewMetricsPadding(void) application.Render(); DALI_TEST_EQUALS( tableView.GetCellPadding(), Size(5.0f, 10.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor1.GetCurrentPosition(), Vector3(5.0f, 10.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(5.0f, 10.0f, 0.0f), TEST_LOCATION ); END_TEST; } @@ -172,9 +172,9 @@ int UtcDaliTableViewMetricsFit(void) application.Render(); // 1. check that with no fixed width/heights, actors are in default position. - DALI_TEST_EQUALS( actor1.GetCurrentPosition(), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2.GetCurrentPosition(), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3.GetCurrentPosition(), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION ); // 2. check that with a fixed width & height, actors to the right and below are offsetted. tableView.SetFitHeight(0); @@ -185,25 +185,25 @@ int UtcDaliTableViewMetricsFit(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor1.GetCurrentPosition(), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2.GetCurrentPosition(), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3.GetCurrentPosition(), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION ); tableView.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT ); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor1.GetCurrentPosition(), Vector3(90.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2.GetCurrentPosition(), Vector3(80.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3.GetCurrentPosition(), Vector3(90.0f, 10.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(90.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(80.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(90.0f, 10.0f, 0.0f), TEST_LOCATION ); tableView.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::LEFT_TO_RIGHT ); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor1.GetCurrentPosition(), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2.GetCurrentPosition(), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3.GetCurrentPosition(), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION ); END_TEST; } @@ -225,9 +225,9 @@ int UtcDaliTableViewMetricsFixed(void) application.Render(); // 1. check that with no fixed width/heights, actors are in default position. - DALI_TEST_EQUALS( actor1.GetCurrentPosition(), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2.GetCurrentPosition(), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3.GetCurrentPosition(), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION ); // 2. check that with a fixed width & height, actors to the right and below are offsetted. tableView.SetFixedWidth(0, 20.0f); @@ -238,9 +238,9 @@ int UtcDaliTableViewMetricsFixed(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor1.GetCurrentPosition(), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2.GetCurrentPosition(), Vector3(20.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3.GetCurrentPosition(), Vector3(0.0f, 50.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(20.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 50.0f, 0.0f), TEST_LOCATION ); END_TEST; } @@ -261,9 +261,9 @@ int UtcDaliTableViewMetricsRelative(void) application.Render(); // 1. check that with no relative width/heights, actors are in default position. - DALI_TEST_EQUALS( actor1.GetCurrentPosition(), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2.GetCurrentPosition(), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3.GetCurrentPosition(), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(10.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 10.0f, 0.0f), TEST_LOCATION ); // 2. check that with a relative width & height, actors to the right and below are offsetted. tableView.SetRelativeWidth(0, 0.3f); // cell 0,0 occupies 30%x50% of the grid (i.e. 30x50 pixels) @@ -274,9 +274,9 @@ int UtcDaliTableViewMetricsRelative(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( actor1.GetCurrentPosition(), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2.GetCurrentPosition(), Vector3(30.0f, 0.0f, 0.0f), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3.GetCurrentPosition(), Vector3(0.0f, 50.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor1.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor2.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(30.0f, 0.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( actor3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0.0f, 50.0f, 0.0f), TEST_LOCATION ); END_TEST; } @@ -375,9 +375,9 @@ int UtcDaliTableViewCells(void) Actor actor1 = Actor::New(); Actor actor2 = Actor::New(); Actor actor3 = Actor::New(); - actor1.SetName("Actor1"); - actor2.SetName("Actor2"); - actor3.SetName("Actor3"); + actor1.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor2.SetProperty( Dali::Actor::Property::NAME,"Actor2"); + actor3.SetProperty( Dali::Actor::Property::NAME,"Actor3"); // note: positions are specified in reversed cartesian coords - row,col (i.e. y,x) tableView.AddChild(actor1, TableView::CellPosition(0,0)); @@ -417,7 +417,7 @@ int UtcDaliTableViewCells(void) std::vector actorsRemoved; tableView.DeleteRow(0, actorsRemoved); tet_printf("Row Delete >> Actors Removed: %d {", actorsRemoved.size()); - for(size_t i = 0;i %s, ", i, actorsRemoved[i].GetName().c_str()); + for(size_t i = 0;i %s, ", i, actorsRemoved[i].GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str()); tet_printf("}\n"); DALI_TEST_EQUALS( static_cast(actorsRemoved.size()), 1, TEST_LOCATION ); DALI_TEST_CHECK( actorsRemoved[0] == actor1 ); @@ -425,7 +425,7 @@ int UtcDaliTableViewCells(void) actorsRemoved.clear(); tableView.DeleteColumn(3, actorsRemoved); tet_printf("Column Delete >> Actors Removed: %d {", actorsRemoved.size()); - for(size_t i = 0;i %s, ", i, actorsRemoved[i].GetName().c_str()); + for(size_t i = 0;i %s, ", i, actorsRemoved[i].GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str()); tet_printf("}\n"); DALI_TEST_EQUALS( static_cast(actorsRemoved.size()), 1, TEST_LOCATION ); DALI_TEST_CHECK( actorsRemoved[0] == actor3 ); @@ -751,9 +751,9 @@ int UtcDaliTableViewChildProperties(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( child3.GetCurrentAnchorPoint(), AnchorPoint::TOP_LEFT, TEST_LOCATION ); - DALI_TEST_EQUALS( child3.GetCurrentParentOrigin(), ParentOrigin::TOP_LEFT, TEST_LOCATION ); - DALI_TEST_EQUALS( child3.GetCurrentPosition(), Vector3(2.5f, 5.0f, 0.0f), TEST_LOCATION ); + DALI_TEST_EQUALS( child3.GetCurrentProperty< Vector3 >( Actor::Property::ANCHOR_POINT ), AnchorPoint::TOP_LEFT, TEST_LOCATION ); + DALI_TEST_EQUALS( child3.GetCurrentProperty< Vector3 >( Actor::Property::PARENT_ORIGIN ), ParentOrigin::TOP_LEFT, TEST_LOCATION ); + DALI_TEST_EQUALS( child3.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(2.5f, 5.0f, 0.0f), TEST_LOCATION ); END_TEST; } @@ -858,7 +858,7 @@ int UtcDaliTableViewKeyboardFocus(void) TableView tableView = TableView::New(4,4); tableView.SetKeyboardFocusable( true ); - tableView.SetName( "TableView"); + tableView.SetProperty( Dali::Actor::Property::NAME, "TableView"); for ( int row = 0; row < 4; ++row ) { @@ -867,7 +867,7 @@ int UtcDaliTableViewKeyboardFocus(void) Control control = Control::New(); std::ostringstream str; str << row << "-" << col; - control.SetName( str.str() ); + control.SetProperty( Dali::Actor::Property::NAME, str.str() ); control.SetKeyboardFocusable( true ); tableView.AddChild( control, TableView::CellPosition( row, col ) ); } @@ -880,55 +880,55 @@ int UtcDaliTableViewKeyboardFocus(void) Actor firstFocusActor = Toolkit::Internal::GetImplementation( tableView ).GetNextKeyboardFocusableActor( Actor(), Control::KeyboardFocus::RIGHT, true ); DALI_TEST_CHECK( firstFocusActor ); - DALI_TEST_CHECK( firstFocusActor.GetName() == "0-0" ); + DALI_TEST_CHECK( firstFocusActor.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-0" ); KeyboardFocusManager manager = KeyboardFocusManager::Get(); manager.SetFocusGroupLoop( true ); manager.SetCurrentFocusActor( firstFocusActor ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-0" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-2" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-2" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-3" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-3" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-0" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-3" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-3" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-2" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-2" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-0" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "3-3" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "3-3" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-0" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" ); manager.MoveFocus( Control::KeyboardFocus::DOWN ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1" ); manager.MoveFocus( Control::KeyboardFocus::DOWN ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "2-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-1" ); manager.MoveFocus( Control::KeyboardFocus::DOWN ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "3-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "3-1" ); manager.MoveFocus( Control::KeyboardFocus::DOWN ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" ); manager.MoveFocus( Control::KeyboardFocus::UP ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "3-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "3-1" ); manager.MoveFocus( Control::KeyboardFocus::UP ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "2-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-1" ); manager.MoveFocus( Control::KeyboardFocus::UP ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1" ); manager.MoveFocus( Control::KeyboardFocus::UP ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" ); END_TEST; } @@ -939,7 +939,7 @@ int UtcDaliTableViewKeyboardFocusInNestedTableView(void) TableView tableView = TableView::New(3, 3); tableView.SetKeyboardFocusable( true ); - tableView.SetName( "TableView"); + tableView.SetProperty( Dali::Actor::Property::NAME, "TableView"); for ( int row = 0; row < 3; ++row ) { @@ -952,7 +952,7 @@ int UtcDaliTableViewKeyboardFocusInNestedTableView(void) { // Add a nested 2x2 table view in the middle cell of the parent table view TableView childTableView = TableView::New(2, 2); - childTableView.SetName( str.str() ); + childTableView.SetProperty( Dali::Actor::Property::NAME, str.str() ); for(int childRow = 0; childRow < 2; childRow++) { @@ -961,7 +961,7 @@ int UtcDaliTableViewKeyboardFocusInNestedTableView(void) Control control = Control::New(); std::ostringstream nameStr; nameStr << row << "-" << col << "-" << childRow << "-" << childCol; - control.SetName( nameStr.str() ); + control.SetProperty( Dali::Actor::Property::NAME, nameStr.str() ); control.SetKeyboardFocusable( true ); childTableView.AddChild( control, TableView::CellPosition( childRow, childCol ) ); } @@ -971,7 +971,7 @@ int UtcDaliTableViewKeyboardFocusInNestedTableView(void) else { Control control = Control::New(); - control.SetName( str.str() ); + control.SetProperty( Dali::Actor::Property::NAME, str.str() ); control.SetKeyboardFocusable( true ); tableView.AddChild( control, TableView::CellPosition( row, col ) ); } @@ -985,74 +985,74 @@ int UtcDaliTableViewKeyboardFocusInNestedTableView(void) Actor firstFocusActor = Toolkit::Internal::GetImplementation( tableView ).GetNextKeyboardFocusableActor( Actor(), Control::KeyboardFocus::RIGHT, true ); DALI_TEST_CHECK( firstFocusActor ); - DALI_TEST_CHECK( firstFocusActor.GetName() == "0-0" ); + DALI_TEST_CHECK( firstFocusActor.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-0" ); KeyboardFocusManager manager = KeyboardFocusManager::Get(); manager.SetFocusGroupLoop( false ); manager.SetCurrentFocusActor( firstFocusActor ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-0" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-2" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-2" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-0" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-1-0-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-0-0" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-1-0-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-0-1" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-1-1-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-1-0" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-1-1-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-1-1" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-2" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-2" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "2-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-0" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "2-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-1" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "2-2" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-2" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "2-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-1" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "2-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-0" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-2" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-2" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-1-1-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-1-1" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-1-1-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-1-0" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-1-0-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-0-1" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-1-0-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-0-0" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-0" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-2" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-2" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" ); manager.MoveFocus( Control::KeyboardFocus::LEFT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-0" ); manager.MoveFocus( Control::KeyboardFocus::RIGHT ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" ); manager.MoveFocus( Control::KeyboardFocus::DOWN ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-1-0-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-0-0" ); manager.MoveFocus( Control::KeyboardFocus::DOWN ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-1-1-0" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-1-0" ); manager.MoveFocus( Control::KeyboardFocus::DOWN ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "2-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "2-1" ); manager.MoveFocus( Control::KeyboardFocus::UP ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-1-1-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-1-1" ); manager.MoveFocus( Control::KeyboardFocus::UP ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "1-1-0-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "1-1-0-1" ); manager.MoveFocus( Control::KeyboardFocus::UP ); - DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetName() == "0-1" ); + DALI_TEST_CHECK( manager.GetCurrentFocusActor().GetProperty< std::string >( Dali::Actor::Property::NAME ) == "0-1" ); END_TEST; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp index 91c9a79..b802817 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp @@ -950,8 +950,8 @@ int utcDaliTextEditorInputStyleChanged01(void) editor.SetSize( 300.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); editor.SetProperty( TextEditor::Property::ENABLE_MARKUP, true ); editor.SetProperty( TextEditor::Property::TEXT, "Hello world demo" ); @@ -1164,8 +1164,8 @@ int utcDaliTextEditorInputStyleChanged02(void) editor.SetSize( 300.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); editor.SetProperty( TextEditor::Property::ENABLE_MARKUP, true ); editor.SetProperty( TextEditor::Property::TEXT, "He llo world demo" ); @@ -1401,8 +1401,8 @@ int utcDaliTextEditorEvent01(void) Stage::GetCurrent().Add( editor ); editor.SetSize( 300.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -1440,8 +1440,8 @@ int utcDaliTextEditorEvent01(void) // Create a second text editor and send key events to it. TextEditor editor2 = TextEditor::New(); - editor2.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor2.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor2.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor2.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); editor2.SetSize( 100.f, 100.f ); editor2.SetPosition( 100.f, 100.f ); @@ -1486,8 +1486,8 @@ int utcDaliTextEditorEvent02(void) Stage::GetCurrent().Add( editor ); editor.SetSize( 300.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -1538,7 +1538,7 @@ int utcDaliTextEditorEvent02(void) } // Move the cursor and check the position changes. - Vector3 position1 = cursor.GetCurrentPosition(); + Vector3 position1 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) ); application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) ); @@ -1547,7 +1547,7 @@ int utcDaliTextEditorEvent02(void) application.SendNotification(); application.Render(); - Vector3 position2 = cursor.GetCurrentPosition(); + Vector3 position2 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); DALI_TEST_CHECK( position2.x < position1.x ); @@ -1558,7 +1558,7 @@ int utcDaliTextEditorEvent02(void) application.SendNotification(); application.Render(); - Vector3 position3 = cursor.GetCurrentPosition(); + Vector3 position3 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); DALI_TEST_EQUALS( position1, position3, TEST_LOCATION ); // Should be in the same position1. @@ -1572,7 +1572,7 @@ int utcDaliTextEditorEvent02(void) application.Render(); // Cursor position should be the same than position1. - Vector3 position4 = cursor.GetCurrentPosition(); + Vector3 position4 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); DALI_TEST_EQUALS( position2, position4, TEST_LOCATION ); // Should be in the same position2. @@ -1583,7 +1583,7 @@ int utcDaliTextEditorEvent02(void) application.SendNotification(); application.Render(); - Vector3 position5 = cursor.GetCurrentPosition(); + Vector3 position5 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); DALI_TEST_CHECK( position5.x > position4.x ); @@ -1597,7 +1597,7 @@ int utcDaliTextEditorEvent02(void) application.Render(); // Cursor position should be the same than position2. - Vector3 position6 = cursor.GetCurrentPosition(); + Vector3 position6 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); DALI_TEST_EQUALS( position2, position6, TEST_LOCATION );// Should be in the same position2. @@ -1622,8 +1622,8 @@ int utcDaliTextEditorEvent03(void) editor.SetProperty( TextEditor::Property::TEXT, "This is a long text for the size of the text-editor." ); editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f ); editor.SetSize( 30.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -1715,8 +1715,8 @@ int utcDaliTextEditorEvent04(void) editor.SetProperty( TextEditor::Property::TEXT, "Hello\nworl" ); editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f ); editor.SetSize( 100.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -1804,8 +1804,8 @@ int utcDaliTextEditorEvent05(void) editor.SetProperty( TextEditor::Property::TEXT, "Hello\nworl" ); editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f ); editor.SetSize( 50.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); editor.SetProperty( TextEditor::Property::SMOOTH_SCROLL, true ); editor.SetProperty( TextEditor::Property::SMOOTH_SCROLL_DURATION, 0.2f ); editor.SetProperty( TextEditor::Property::ENABLE_SCROLL_BAR, true ); @@ -1886,8 +1886,8 @@ int utcDaliTextEditorEvent06(void) editor.SetProperty( TextEditor::Property::TEXT, "Hello\nworld\nHello world" ); editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f ); editor.SetSize( 100.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -1976,8 +1976,8 @@ int utcDaliTextEditorEvent07(void) editor.SetProperty( TextEditor::Property::TEXT, "Hello\nworld\nHello world" ); editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f ); editor.SetSize( 100.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -2120,8 +2120,8 @@ int utcDaliTextEditorEvent08(void) editor.SetProperty( TextEditor::Property::TEXT, "DALi" ); editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f ); editor.SetSize( 100.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -2327,8 +2327,8 @@ int utcDaliTextEditorHandles(void) editor.SetProperty( TextEditor::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, imagePropertyMap ); editor.SetSize( 30.f, 500.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -2546,8 +2546,8 @@ int utcDaliTextEditorScrollStateChangedSignalTest(void) editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f ); editor.SetSize( 50.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); editor.SetProperty( TextEditor::Property::ENABLE_SCROLL_BAR, true ); editor.SetKeyboardFocusable(true); @@ -2634,8 +2634,8 @@ int UtcDaliTextEditorSetPaddingProperty(void) TextEditor editor = TextEditor::New(); DALI_TEST_CHECK( editor ); editor.SetSize( 300.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( editor ); application.SendNotification(); @@ -2667,8 +2667,8 @@ int UtcDaliTextEditorEnableShiftSelectionProperty(void) TextEditor editor = TextEditor::New(); DALI_TEST_CHECK( editor ); editor.SetSize( 300.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( editor ); application.SendNotification(); @@ -2695,8 +2695,8 @@ int UtcDaliTextEditorEnableGrabHandleProperty(void) TextEditor editor = TextEditor::New(); DALI_TEST_CHECK( editor ); editor.SetSize( 300.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( editor ); application.SendNotification(); @@ -2723,8 +2723,8 @@ int UtcDaliTextEditorMatchSystemLanguageDirectionProperty(void) TextEditor editor = TextEditor::New(); DALI_TEST_CHECK( editor ); editor.SetSize( 300.f, 50.f ); - editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - editor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + editor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + editor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( editor ); application.SendNotification(); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp index e58ab4d..05f7d7b 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp @@ -1123,8 +1123,8 @@ int utcDaliTextFieldInputStyleChanged01(void) field.SetSize( 300.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); field.SetProperty( TextField::Property::ENABLE_MARKUP, true ); field.SetProperty( TextField::Property::TEXT, "Hello world demo" ); @@ -1331,8 +1331,8 @@ int utcDaliTextFieldInputStyleChanged02(void) DALI_TEST_CHECK( field ); field.SetSize( 300.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); field.SetProperty( TextField::Property::ENABLE_MARKUP, true ); field.SetProperty( TextField::Property::TEXT, "He llo world demo" ); @@ -1527,8 +1527,8 @@ int utcDaliTextFieldEvent01(void) Stage::GetCurrent().Add( field ); field.SetSize( 300.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Render and notify application.SendNotification(); @@ -1576,8 +1576,8 @@ int utcDaliTextFieldEvent01(void) // Create a second text field and send key events to it. TextField field2 = TextField::New(); - field2.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field2.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field2.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field2.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); field2.SetSize( 100.f, 100.0f ); field2.SetPosition( 100.0f, 100.0f ); @@ -1623,8 +1623,8 @@ int utcDaliTextFieldEvent02(void) Stage::GetCurrent().Add( field ); field.SetSize( 300.0f, 50.0f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -1676,14 +1676,14 @@ int utcDaliTextFieldEvent02(void) } // Move the cursor and check the position changes. - Vector3 position1 = cursor.GetCurrentPosition(); + Vector3 position1 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) ); // Render and notify application.SendNotification(); application.Render(); - Vector3 position2 = cursor.GetCurrentPosition(); + Vector3 position2 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); DALI_TEST_CHECK( position2.x < position1.x ); application.ProcessEvent( GenerateKey( "", "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::Down, "", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) ); @@ -1692,7 +1692,7 @@ int utcDaliTextFieldEvent02(void) application.SendNotification(); application.Render(); - Vector3 position3 = cursor.GetCurrentPosition(); + Vector3 position3 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); DALI_TEST_EQUALS( position1, position3, TEST_LOCATION ); // Should be in the same position1. @@ -1704,7 +1704,7 @@ int utcDaliTextFieldEvent02(void) application.SendNotification(); application.Render(); - Vector3 position4 = cursor.GetCurrentPosition(); + Vector3 position4 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); // Send some taps and check the cursor positions. @@ -1716,7 +1716,7 @@ int utcDaliTextFieldEvent02(void) application.Render(); // Cursor position should be the same than position1. - Vector3 position5 = cursor.GetCurrentPosition(); + Vector3 position5 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); DALI_TEST_EQUALS( position4, position5, TEST_LOCATION ); // Should be in the same position2. @@ -1727,7 +1727,7 @@ int utcDaliTextFieldEvent02(void) application.SendNotification(); application.Render(); - Vector3 position6 = cursor.GetCurrentPosition(); + Vector3 position6 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); DALI_TEST_CHECK( position6.x > position5.x ); @@ -1741,7 +1741,7 @@ int utcDaliTextFieldEvent02(void) application.Render(); // Cursor position should be the same than position2. - Vector3 position7 = cursor.GetCurrentPosition(); + Vector3 position7 = cursor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); DALI_TEST_EQUALS( position4, position7, TEST_LOCATION );// Should be in the same position2. @@ -1776,8 +1776,8 @@ int utcDaliTextFieldEvent03(void) field.SetProperty( TextField::Property::TEXT, "This is a long text for the size of the text-field." ); field.SetProperty( TextField::Property::POINT_SIZE, 10.f ); field.SetSize( 30.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -1837,8 +1837,8 @@ int utcDaliTextFieldEvent04(void) field.SetProperty( TextField::Property::TEXT, "This is a long text for the size of the text-field." ); field.SetProperty( TextField::Property::POINT_SIZE, 10.f ); field.SetSize( 300.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -1890,8 +1890,8 @@ int utcDaliTextFieldEvent05(void) field.SetProperty( TextField::Property::TEXT, "This is a long text for the size of the text-field." ); field.SetProperty( TextField::Property::POINT_SIZE, 10.f ); field.SetSize( 300.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -1941,8 +1941,8 @@ int utcDaliTextFieldEvent06(void) field.SetProperty( TextField::Property::TEXT, "Thisisalongtextforthesizeofthetextfield." ); field.SetProperty( TextField::Property::POINT_SIZE, 10.f ); field.SetSize( 300.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -1992,8 +1992,8 @@ int utcDaliTextFieldEvent07(void) field.SetProperty( TextField::Property::TEXT, "Thisisalongtextforthesizeofthetextfield." ); field.SetProperty( TextField::Property::POINT_SIZE, 10.f ); field.SetSize( 300.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Property::Map propertyMap; propertyMap["PANEL_LAYOUT"] = InputMethod::PanelLayout::PASSWORD; field.SetProperty( TextField::Property::INPUT_METHOD_SETTINGS, propertyMap ); @@ -2035,8 +2035,8 @@ int utcDaliTextFieldEvent08(void) field.SetProperty( TextField::Property::PLACEHOLDER_TEXT, "Setting Placeholder Text" ); field.SetProperty( TextField::Property::POINT_SIZE, 10.f ); field.SetSize( 300.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -2069,7 +2069,7 @@ int utcDaliTextFieldEvent08(void) if (actor) { - Vector3 worldPosition = actor.GetCurrentWorldPosition(); + Vector3 worldPosition = actor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ); Vector2 halfStageSize = stage.GetSize() / 2.0f; Vector2 position(worldPosition.x + halfStageSize.width, worldPosition.y + halfStageSize.height); @@ -2103,8 +2103,8 @@ int utcDaliTextFieldEvent09(void) field.SetProperty( TextField::Property::TEXT, "Hello" ); field.SetProperty( TextField::Property::POINT_SIZE, 10.f ); field.SetSize( 300.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -2190,8 +2190,8 @@ int utcDaliTextFieldStyleWhilstSelected(void) field.SetProperty( TextField::Property::TEXT, "This is a long text for the size of the text-field." ); field.SetProperty( TextField::Property::POINT_SIZE, 10.f ); field.SetSize( 300.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -2292,8 +2292,8 @@ int utcDaliTextFieldEscKeyLoseFocus(void) Stage::GetCurrent().Add( field ); field.SetSize( 300.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -2374,8 +2374,8 @@ int utcDaliTextFieldSomeSpecialKeys(void) field.SetProperty( TextField::Property::TEXT, longText ); field.SetProperty( TextField::Property::POINT_SIZE, 10.f ); field.SetSize( 300.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -2455,8 +2455,8 @@ int utcDaliTextFieldSizeUpdate(void) field.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY , Dimension::HEIGHT ); field.SetProperty( TextField::Property::TEXT, "ኢ"); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); field.SetKeyboardFocusable(true); KeyboardFocusManager::Get().SetCurrentFocusActor( field ); @@ -2490,8 +2490,8 @@ int utcDaliTextFieldExtremlyLargePointSize(void) field.SetProperty( TextField::Property::TEXT, "Text" ); field.SetSize( 300.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( field ); try @@ -2620,8 +2620,8 @@ int UtcDaliTextFieldSetPaddingProperty(void) TextField field = TextField::New(); DALI_TEST_CHECK( field ); field.SetSize( 300.f, 50.f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( field ); application.SendNotification(); @@ -2653,8 +2653,8 @@ int UtcDaliTextFieldEnableShiftSelectionProperty(void) TextField field = TextField::New(); DALI_TEST_CHECK( field ); field.SetSize( 300.0f, 50.0f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( field ); application.SendNotification(); @@ -2681,8 +2681,8 @@ int UtcDaliTextFieldEnableGrabHandleProperty(void) TextField field = TextField::New(); DALI_TEST_CHECK( field ); field.SetSize( 300.0f, 50.0f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( field ); application.SendNotification(); @@ -2709,8 +2709,8 @@ int UtcDaliTextFieldMatchSystemLanguageDirectionProperty(void) TextField field = TextField::New(); DALI_TEST_CHECK( field ); field.SetSize( 300.0f, 50.0f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( field ); application.SendNotification(); @@ -2742,8 +2742,8 @@ int utcDaliTextFieldLayoutDirectionCoverage(void) Stage::GetCurrent().Add( field ); field.SetSize( 300.0f, 50.0f ); - field.SetParentOrigin( ParentOrigin::TOP_LEFT ); - field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -2831,8 +2831,8 @@ int UtcDaliTextFieldSelectWholeText(void) Stage::GetCurrent().Add( textField ); textField.SetSize( 300.f, 50.f ); - textField.SetParentOrigin( ParentOrigin::TOP_LEFT ); - textField.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + textField.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + textField.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); @@ -2883,8 +2883,8 @@ int UtcDaliTextFieldSelectNone(void) Stage::GetCurrent().Add( textField ); textField.SetSize( 300.f, 50.f ); - textField.SetParentOrigin( ParentOrigin::TOP_LEFT ); - textField.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + textField.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + textField.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Avoid a crash when core load gl resources. application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp index 2d6b092..5735515 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp @@ -1119,8 +1119,8 @@ int UtcDaliToolkitTextlabelEllipsis(void) Stage::GetCurrent().Add( label ); // Turn on all the effects - label.SetAnchorPoint( AnchorPoint::CENTER ); - label.SetParentOrigin( ParentOrigin::CENTER ); + label.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + label.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); label.SetSize( 360.0f, 10.f ); try @@ -1481,7 +1481,7 @@ int UtcDaliToolkitTextLabelBitmapFont(void) application.Render(); // The text has been rendered if the height of the text-label is the height of the line. - DALI_TEST_EQUALS( label.GetCurrentSize().height, 34.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + DALI_TEST_EQUALS( label.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height, 34.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); END_TEST; } @@ -1579,7 +1579,7 @@ int UtcDaliToolkitTextlabelMaxTextureSet(void) const int maxTextureSize = Dali::GetMaxTextureSize(); // Whether the rendered text is greater than maxTextureSize - DALI_TEST_CHECK( label.GetCurrentSize().height > maxTextureSize ); + DALI_TEST_CHECK( label.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height > maxTextureSize ); // Check if the number of renderers is greater than 1. DALI_TEST_CHECK( label.GetRendererCount() > 1u ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp index dc7fcc7..4e17c01 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp @@ -153,7 +153,7 @@ int UtcDaliToolkitTextSelectionToolBarP(void) toolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, Size( 100.0f, 60.0f) ); Toolkit::PushButton option = Toolkit::PushButton::New(); - option.SetName( "test-option" ); + option.SetProperty( Dali::Actor::Property::NAME, "test-option" ); option.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); toolbar.AddOption( option ); @@ -163,7 +163,7 @@ int UtcDaliToolkitTextSelectionToolBarP(void) toolbar.AddDivider( divider ); Toolkit::PushButton option2 = Toolkit::PushButton::New(); - option2.SetName( "test-option-2" ); + option2.SetProperty( Dali::Actor::Property::NAME, "test-option-2" ); option2.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); toolbar.AddOption( option2 ); @@ -184,7 +184,7 @@ int UtcDaliToolkitTextSelectionToolBarScrollBarP(void) toolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, Size( 100.0f, 60.0f) ); Toolkit::PushButton option = Toolkit::PushButton::New(); - option.SetName( "test-option" ); + option.SetProperty( Dali::Actor::Property::NAME, "test-option" ); option.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); toolbar.AddOption( option ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringLTR.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringLTR.cpp index 6a4bfa8..7d0e107 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringLTR.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringLTR.cpp @@ -96,9 +96,9 @@ int UtcDaliToolkitTextSelectionPopupMirroringLTR(void) } // The order should be COPY, CUT, PASTE - DALI_TEST_EQUALS( COPY, tableOfButtons.GetChildAt( 0 ).GetName(), TEST_LOCATION ); - DALI_TEST_EQUALS( CUT, tableOfButtons.GetChildAt( 2 ).GetName(), TEST_LOCATION ); - DALI_TEST_EQUALS( PASTE, tableOfButtons.GetChildAt( 4 ).GetName(), TEST_LOCATION ); + DALI_TEST_EQUALS( COPY, tableOfButtons.GetChildAt( 0 ).GetProperty< std::string >( Dali::Actor::Property::NAME ), TEST_LOCATION ); + DALI_TEST_EQUALS( CUT, tableOfButtons.GetChildAt( 2 ).GetProperty< std::string >( Dali::Actor::Property::NAME ), TEST_LOCATION ); + DALI_TEST_EQUALS( PASTE, tableOfButtons.GetChildAt( 4 ).GetProperty< std::string >( Dali::Actor::Property::NAME ), TEST_LOCATION ); tet_result(TET_PASS); END_TEST; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringRTL.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringRTL.cpp index 930e85e..dc76c3c 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringRTL.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopupMirroringRTL.cpp @@ -96,9 +96,9 @@ int UtcDaliToolkitTextSelectionPopupMirroringRTL(void) } // The order should be PASTE, CUT, COPY - DALI_TEST_EQUALS( PASTE, tableOfButtons.GetChildAt( 0 ).GetName(), TEST_LOCATION ); - DALI_TEST_EQUALS( CUT, tableOfButtons.GetChildAt( 2 ).GetName(), TEST_LOCATION ); - DALI_TEST_EQUALS( COPY, tableOfButtons.GetChildAt( 4 ).GetName(), TEST_LOCATION ); + DALI_TEST_EQUALS( PASTE, tableOfButtons.GetChildAt( 0 ).GetProperty< std::string >( Dali::Actor::Property::NAME ), TEST_LOCATION ); + DALI_TEST_EQUALS( CUT, tableOfButtons.GetChildAt( 2 ).GetProperty< std::string >( Dali::Actor::Property::NAME ), TEST_LOCATION ); + DALI_TEST_EQUALS( COPY, tableOfButtons.GetChildAt( 4 ).GetProperty< std::string >( Dali::Actor::Property::NAME ), TEST_LOCATION ); tet_result(TET_PASS); END_TEST; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ToggleButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ToggleButton.cpp index 2f75b37..230bdb8 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-ToggleButton.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ToggleButton.cpp @@ -172,8 +172,8 @@ int UtcDaliToggleButtonToggleStatesProperty(void) // Create the ToggleButton actor ToggleButton toggleButton = ToggleButton::New(); Stage::GetCurrent().Add( toggleButton ); - toggleButton.SetParentOrigin(ParentOrigin::TOP_LEFT); - toggleButton.SetAnchorPoint(ParentOrigin::TOP_LEFT); + toggleButton.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + toggleButton.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); toggleButton.SetPosition( 0.0f, 0.0f ); {// Check empty array @@ -253,8 +253,8 @@ int UtcDaliToggleButtonToggleTipsProperty( void ) // Create the ToggleButton actor ToggleButton toggleButton = ToggleButton::New(); Stage::GetCurrent().Add( toggleButton ); - toggleButton.SetParentOrigin(ParentOrigin::TOP_LEFT); - toggleButton.SetAnchorPoint(ParentOrigin::TOP_LEFT); + toggleButton.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + toggleButton.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); toggleButton.SetPosition( 0.0f, 0.0f ); { // Check empty tip array @@ -312,8 +312,8 @@ int UtcDaliToggleButtonStateChange(void) // Create the ToggleButton actor ToggleButton toggleButton = ToggleButton::New(); Stage::GetCurrent().Add( toggleButton ); - toggleButton.SetParentOrigin(ParentOrigin::TOP_LEFT); - toggleButton.SetAnchorPoint(ParentOrigin::TOP_LEFT); + toggleButton.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + toggleButton.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); toggleButton.SetPosition( BUTTON_POSITON_TO_GET_INSIDE_TOUCH_EVENTS ); toggleButton.SetSize( BUTTON_SIZE_TO_GET_INSIDE_TOUCH_EVENTS ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp index 3dfaec2..573ffac 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Tooltip.cpp @@ -508,8 +508,8 @@ int UtcDaliTooltipDisplay(void) Control control = Control::New(); control.SetProperty( DevelControl::Property::TOOLTIP, "Test" ); - control.SetAnchorPoint( AnchorPoint::CENTER ); - control.SetParentOrigin( ParentOrigin::CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); control.SetSize( 100.0f, 100.0f ); Actor rootActor = Stage::GetCurrent().GetRootLayer(); @@ -543,8 +543,8 @@ int UtcDaliTooltipDisplayWithTail(void) ToolkitTestApplication application; // Exceptions require ToolkitTestApplication Control control = Control::New(); - control.SetAnchorPoint( AnchorPoint::CENTER ); - control.SetParentOrigin( ParentOrigin::CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); control.SetSize( 100.0f, 100.0f ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) @@ -583,8 +583,8 @@ int UtcDaliTooltipDisplayWithContentArray(void) ToolkitTestApplication application; // Exceptions require ToolkitTestApplication Control control = Control::New(); - control.SetAnchorPoint( AnchorPoint::CENTER ); - control.SetParentOrigin( ParentOrigin::CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); control.SetSize( 100.0f, 100.0f ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, @@ -627,8 +627,8 @@ int UtcDaliTooltipDisplayBelow(void) ToolkitTestApplication application; // Exceptions require ToolkitTestApplication Control control = Control::New(); - control.SetAnchorPoint( AnchorPoint::CENTER ); - control.SetParentOrigin( ParentOrigin::CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); control.SetSize( 100.0f, 100.0f ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) @@ -653,7 +653,7 @@ int UtcDaliTooltipDisplayBelow(void) Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip tet_infoline( "Ensure tooltip is below control" ); - DALI_TEST_CHECK( ( control.GetCurrentWorldPosition().y + 50.0f /* Half Size */) < tooltip.GetCurrentWorldPosition().y ); + DALI_TEST_CHECK( ( control.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y + 50.0f /* Half Size */) < tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y ); END_TEST; } @@ -663,8 +663,8 @@ int UtcDaliTooltipDisplayAbove(void) ToolkitTestApplication application; // Exceptions require ToolkitTestApplication Control control = Control::New(); - control.SetAnchorPoint( AnchorPoint::CENTER ); - control.SetParentOrigin( ParentOrigin::CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); control.SetSize( 100.0f, 100.0f ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) @@ -689,7 +689,7 @@ int UtcDaliTooltipDisplayAbove(void) Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip tet_infoline( "Ensure tooltip is above control" ); - DALI_TEST_CHECK( ( control.GetCurrentWorldPosition().y - 50.0f /* Half Size */) >= ( tooltip.GetCurrentWorldPosition().y + 0.5f * tooltip.GetCurrentSize().height ) ); + DALI_TEST_CHECK( ( control.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y - 50.0f /* Half Size */) >= ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y + 0.5f * tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height ) ); END_TEST; } @@ -699,8 +699,8 @@ int UtcDaliTooltipDisplayAtHoverPoint(void) ToolkitTestApplication application; // Exceptions require ToolkitTestApplication Control control = Control::New(); - control.SetAnchorPoint( AnchorPoint::CENTER ); - control.SetParentOrigin( ParentOrigin::CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); control.SetSize( 100.0f, 100.0f ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) @@ -728,8 +728,8 @@ int UtcDaliTooltipDisplayAtHoverPoint(void) Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip tet_infoline( "Ensure tooltip is below and to the right of control" ); - DALI_TEST_CHECK( ( hoverPoint.y - stageSize.height * 0.5f ) < tooltip.GetCurrentWorldPosition().y ); - DALI_TEST_CHECK( ( hoverPoint.x - stageSize.width * 0.5f ) < tooltip.GetCurrentWorldPosition().x ); + DALI_TEST_CHECK( ( hoverPoint.y - stageSize.height * 0.5f ) < tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y ); + DALI_TEST_CHECK( ( hoverPoint.x - stageSize.width * 0.5f ) < tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x ); END_TEST; } @@ -739,8 +739,8 @@ int UtcDaliTooltipExceedThreshold(void) ToolkitTestApplication application; // Exceptions require ToolkitTestApplication Control control = Control::New(); - control.SetAnchorPoint( AnchorPoint::CENTER ); - control.SetParentOrigin( ParentOrigin::CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); control.SetSize( 100.0f, 100.0f ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) @@ -788,8 +788,8 @@ int UtcDaliTooltipGoOutOfBounds(void) ToolkitTestApplication application; // Exceptions require ToolkitTestApplication Control control = Control::New(); - control.SetAnchorPoint( AnchorPoint::CENTER ); - control.SetParentOrigin( ParentOrigin::CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); control.SetSize( 100.0f, 100.0f ); control.SetProperty( DevelControl::Property::TOOLTIP, "Test" ); @@ -834,8 +834,8 @@ int UtcDaliTooltipHideTooltipWhenOutOfBounds(void) Control control = Control::New(); control.SetProperty( DevelControl::Property::TOOLTIP, "Test" ); - control.SetAnchorPoint( AnchorPoint::CENTER ); - control.SetParentOrigin( ParentOrigin::CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); control.SetSize( 100.0f, 100.0f ); Actor rootActor = Stage::GetCurrent().GetRootLayer(); @@ -877,8 +877,8 @@ int UtcDaliTooltipHideTooltipWhenSetToDisapperOnMovement(void) ToolkitTestApplication application; // Exceptions require ToolkitTestApplication Control control = Control::New(); - control.SetAnchorPoint( AnchorPoint::CENTER ); - control.SetParentOrigin( ParentOrigin::CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); control.SetSize( 100.0f, 100.0f ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) @@ -926,8 +926,8 @@ int UtcDaliTooltipChangeContent(void) Control control = Control::New(); control.SetProperty( DevelControl::Property::TOOLTIP, "Test" ); - control.SetAnchorPoint( AnchorPoint::CENTER ); - control.SetParentOrigin( ParentOrigin::CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); control.SetSize( 100.0f, 100.0f ); Actor rootActor = Stage::GetCurrent().GetRootLayer(); @@ -1013,8 +1013,8 @@ int UtcDaliTooltipEnsureRemainsOnStage1(void) tet_infoline( "Create a control and place it at the bottom of the screen, setting the tooltip to appear below" ); Control control = Control::New(); - control.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); - control.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER ); control.SetSize( stageSize ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) @@ -1042,7 +1042,7 @@ int UtcDaliTooltipEnsureRemainsOnStage1(void) tet_infoline( "Ensure tooltip is still on the screen" ); Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip - DALI_TEST_CHECK( ( tooltip.GetCurrentWorldPosition().y + tooltip.GetCurrentSize().height * 0.5f ) <= centerPoint.height ); + DALI_TEST_CHECK( ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y + tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height * 0.5f ) <= centerPoint.height ); END_TEST; } @@ -1055,8 +1055,8 @@ int UtcDaliTooltipEnsureRemainsOnStage2(void) tet_infoline( "Create a control and place it at the top of the screen, setting the tooltip to appear above" ); Control control = Control::New(); - control.SetAnchorPoint( AnchorPoint::TOP_CENTER ); - control.SetParentOrigin( ParentOrigin::TOP_CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER ); control.SetSize( stageSize ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) @@ -1084,7 +1084,7 @@ int UtcDaliTooltipEnsureRemainsOnStage2(void) tet_infoline( "Ensure tooltip is still on the screen" ); Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip - DALI_TEST_CHECK( ( tooltip.GetCurrentWorldPosition().y - tooltip.GetCurrentSize().height * 0.5f ) >= -centerPoint.height ); + DALI_TEST_CHECK( ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).y - tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height * 0.5f ) >= -centerPoint.height ); END_TEST; } @@ -1098,8 +1098,8 @@ int UtcDaliTooltipEnsureRemainsOnStage3(void) tet_infoline( "Create a control and adjust it's position so that the tooltip will attempt to appear to the left of the screen" ); Control control = Control::New(); - control.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); - control.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER ); control.SetSize( stageSize ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) @@ -1129,7 +1129,7 @@ int UtcDaliTooltipEnsureRemainsOnStage3(void) tet_infoline( "Ensure tooltip is still on the screen" ); Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip - DALI_TEST_CHECK( ( tooltip.GetCurrentWorldPosition().x - tooltip.GetCurrentSize().width * 0.5f ) >= -centerPoint.width ); + DALI_TEST_CHECK( ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x - tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width * 0.5f ) >= -centerPoint.width ); END_TEST; } @@ -1143,8 +1143,8 @@ int UtcDaliTooltipEnsureRemainsOnStage4(void) tet_infoline( "Create a control and adjust it's position so that the tooltip will attempt to appear to the right of the screen" ); Control control = Control::New(); - control.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); - control.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); + control.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); + control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER ); control.SetSize( stageSize ); control.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, "Test" ) @@ -1174,7 +1174,7 @@ int UtcDaliTooltipEnsureRemainsOnStage4(void) tet_infoline( "Ensure tooltip is still on the screen" ); Actor tooltip = rootActor.GetChildAt( rootActor.GetChildCount() - 1 ); // Last actor added will be our tooltip - DALI_TEST_CHECK( ( tooltip.GetCurrentWorldPosition().x + tooltip.GetCurrentSize().width * 0.5f ) <= centerPoint.width ); + DALI_TEST_CHECK( ( tooltip.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ).x + tooltip.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width * 0.5f ) <= centerPoint.width ); END_TEST; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp index 1db1bc5..81bf496 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp @@ -235,8 +235,8 @@ int UtcDaliTransitionDataMap1P(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetName("Actor1"); - actor.SetColor(Color::CYAN); + actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor.SetProperty( Actor::Property::COLOR,Color::CYAN); Stage::GetCurrent().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -303,8 +303,8 @@ int UtcDaliTransitionDataMap2P(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetName("Actor1"); - actor.SetColor(Color::CYAN); + actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor.SetProperty( Actor::Property::COLOR,Color::CYAN); Stage::GetCurrent().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -371,8 +371,8 @@ int UtcDaliTransitionDataMap2Pb(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetName("Actor1"); - actor.SetColor(Color::CYAN); + actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor.SetProperty( Actor::Property::COLOR,Color::CYAN); Stage::GetCurrent().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -443,7 +443,7 @@ int UtcDaliTransitionDataMap3P(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetName("Actor1"); + actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); Stage::GetCurrent().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -452,7 +452,7 @@ int UtcDaliTransitionDataMap3P(void) application.SendNotification(); application.Render(0); - DALI_TEST_EQUALS( actor.GetCurrentPosition(), Vector3(0,0,0), 0.001f, TEST_LOCATION); + DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0,0,0), 0.001f, TEST_LOCATION); anim.Play(); @@ -461,19 +461,19 @@ int UtcDaliTransitionDataMap3P(void) application.Render(250); // 25% application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentPosition(), Vector3(-10,-10,0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve at 50% + DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(-10,-10,0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve at 50% application.Render(250); // Halfway thru map1 anim application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentPosition(), Vector3(24,24,0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve at 50% + DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(24,24,0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve at 50% application.Render(250); // End of map1 anim application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentPosition(), Vector3(100,100,0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve + DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(100,100,0), 1.0, TEST_LOCATION); // High epsilon as we don't have exact figure for bezier curve application.Render(250); // End of map1 anim application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentPosition(), Vector3(100,100,0), TEST_LOCATION ); + DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(100,100,0), TEST_LOCATION ); END_TEST; } @@ -510,7 +510,7 @@ int UtcDaliTransitionDataMap4P(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetName("Actor1"); + actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); Stage::GetCurrent().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -571,8 +571,8 @@ int UtcDaliTransitionDataMap5P(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetName("Actor1"); - actor.SetColor(Color::CYAN); + actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor.SetProperty( Actor::Property::COLOR,Color::CYAN); Stage::GetCurrent().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -643,8 +643,8 @@ int UtcDaliTransitionDataMap6P(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetName("Actor1"); - actor.SetColor(Color::CYAN); + actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor.SetProperty( Actor::Property::COLOR,Color::CYAN); Stage::GetCurrent().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -716,8 +716,8 @@ int UtcDaliTransitionDataMap1N(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetName("Actor1"); - actor.SetColor(Color::CYAN); + actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor.SetProperty( Actor::Property::COLOR,Color::CYAN); Stage::GetCurrent().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -751,8 +751,8 @@ int UtcDaliTransitionDataMapN3(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetName("Actor1"); - actor.SetColor(Color::CYAN); + actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor.SetProperty( Actor::Property::COLOR,Color::CYAN); // Don't stage actor DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -792,8 +792,8 @@ int UtcDaliTransitionDataMapN4(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetName("Actor1"); - actor.SetColor(Color::CYAN); + actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor.SetProperty( Actor::Property::COLOR,Color::CYAN); Stage::GetCurrent().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -844,8 +844,8 @@ int UtcDaliTransitionDataMapN5(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetName("Actor1"); - actor.SetColor(Color::CYAN); + actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor.SetProperty( Actor::Property::COLOR,Color::CYAN); Stage::GetCurrent().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -895,8 +895,8 @@ int UtcDaliTransitionDataMapN6(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetName("Actor1"); - actor.SetColor(Color::CYAN); + actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor.SetProperty( Actor::Property::COLOR,Color::CYAN); Stage::GetCurrent().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -967,37 +967,37 @@ int UtcDaliTransitionDataArrayP(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - actor.SetName("Actor1"); - actor.SetColor(Color::CYAN); + actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); + actor.SetProperty( Actor::Property::COLOR,Color::CYAN); Stage::GetCurrent().Add(actor); - DALI_TEST_EQUALS( actor.GetCurrentOrientation(), Quaternion(Radian(0), Vector3::ZAXIS), TEST_LOCATION); + DALI_TEST_EQUALS( actor.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion(Radian(0), Vector3::ZAXIS), TEST_LOCATION); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); Animation anim = dummyImpl.CreateTransition( transition ); DALI_TEST_CHECK( anim ); application.SendNotification(); application.Render(0); - DALI_TEST_EQUALS( actor.GetCurrentColor(), Color::MAGENTA, TEST_LOCATION); - DALI_TEST_EQUALS( actor.GetCurrentOrientation(), Quaternion(Radian(Math::PI_2), Vector3::ZAXIS), TEST_LOCATION); + DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Color::MAGENTA, TEST_LOCATION); + DALI_TEST_EQUALS( actor.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion(Radian(Math::PI_2), Vector3::ZAXIS), TEST_LOCATION); anim.Play(); application.SendNotification(); application.Render(0); // start map2 anim application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentPosition(), Vector3(100,0,0), TEST_LOCATION); + DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(100,0,0), TEST_LOCATION); application.Render(500); // Start map1 animation, halfway thru map2 anim application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentPosition(), Vector3(50,50,0), TEST_LOCATION); + DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(50,50,0), TEST_LOCATION); application.Render(500); // Halfway thru map1 anim, end of map2 anim application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentPosition(), Vector3(0,100,0), TEST_LOCATION); - DALI_TEST_EQUALS( actor.GetCurrentColor(), (Color::MAGENTA+Color::RED)*0.5f, TEST_LOCATION); + DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(0,100,0), TEST_LOCATION); + DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), (Color::MAGENTA+Color::RED)*0.5f, TEST_LOCATION); application.Render(500); // End of map1 anim application.SendNotification(); - DALI_TEST_EQUALS( actor.GetCurrentColor(), Color::RED, TEST_LOCATION ); + DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Color::RED, TEST_LOCATION ); END_TEST; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp index a38ec18..89b78bf 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp @@ -405,14 +405,14 @@ int UtcDaliVideoViewMethodsForCoverage2(void) Vector3 vector(100.0f, 100.0f, 0.0f); - DALI_TEST_CHECK(vector != videoView.GetCurrentSize()); + DALI_TEST_CHECK(vector != videoView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE )); videoView.SetSize( vector ); application.SendNotification(); application.Render(); // Check the size in the new frame - DALI_TEST_CHECK(vector == videoView.GetCurrentSize()); + DALI_TEST_CHECK(vector == videoView.GetCurrentProperty< Vector3 >( Actor::Property::SIZE )); END_TEST; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp index aa1e8f6..98dc9dd 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp @@ -20,6 +20,7 @@ #include #include +#include #include #include #include @@ -1818,7 +1819,7 @@ int UtcDaliVisualAnimateBorderVisual01(void) Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, borderVisual ); actor.SetSize(2000, 2000); - actor.SetParentOrigin(ParentOrigin::CENTER); + actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); Stage::GetCurrent().Add(actor); DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); @@ -1886,7 +1887,7 @@ int UtcDaliVisualAnimateBorderVisual02(void) Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, borderVisual ); actor.SetSize(2000, 2000); - actor.SetParentOrigin(ParentOrigin::CENTER); + actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); Stage::GetCurrent().Add(actor); DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); @@ -1930,7 +1931,7 @@ int UtcDaliVisualAnimateColorVisual(void) Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, borderVisual ); actor.SetSize(2000, 2000); - actor.SetParentOrigin(ParentOrigin::CENTER); + actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); Stage::GetCurrent().Add(actor); DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); @@ -1985,8 +1986,8 @@ int UtcDaliVisualAnimatePrimitiveVisual(void) Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetSize(2000, 2000); - actor.SetParentOrigin(ParentOrigin::CENTER); - actor.SetColor(Color::BLACK); + actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + actor.SetProperty( Actor::Property::COLOR,Color::BLACK); Stage::GetCurrent().Add(actor); DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION); @@ -2032,7 +2033,7 @@ int UtcDaliVisualAnimatePrimitiveVisual(void) application.Render(2001u); // go past end application.SendNotification(); // Trigger signals - DALI_TEST_EQUALS( actor.GetCurrentColor(), Color::WHITE, TEST_LOCATION ); + DALI_TEST_EQUALS( actor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Color::WHITE, TEST_LOCATION ); DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("uColor", Vector4( 1.0f, 1.0f, 1.0f, TARGET_MIX_COLOR.a ) ), true, TEST_LOCATION ); DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue("mixColor", Vector3(TARGET_MIX_COLOR) ), true, TEST_LOCATION ); @@ -2060,8 +2061,8 @@ int UtcDaliVisualAnimatedGradientVisual01(void) Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetSize(2000, 2000); - actor.SetParentOrigin(ParentOrigin::CENTER); - actor.SetColor(Color::BLACK); + actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + actor.SetProperty( Actor::Property::COLOR,Color::BLACK); Stage::GetCurrent().Add(actor); application.SendNotification(); @@ -2231,8 +2232,8 @@ int UtcDaliVisualAnimatedGradientVisual02(void) Impl::DummyControl& dummyImpl = static_cast( actor.GetImplementation() ); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetSize( 2000, 2000 ); - actor.SetParentOrigin(ParentOrigin::CENTER); - actor.SetColor(Color::BLACK); + actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + actor.SetProperty( Actor::Property::COLOR,Color::BLACK); Stage::GetCurrent().Add(actor); application.SendNotification(); @@ -2505,8 +2506,8 @@ int UtcDaliVisualAnimatedGradientVisual03(void) Impl::DummyControl& dummyImpl = static_cast( actor.GetImplementation() ); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); actor.SetSize( 2000, 2000 ); - actor.SetParentOrigin(ParentOrigin::CENTER); - actor.SetColor(Color::BLACK); + actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + actor.SetProperty( Actor::Property::COLOR,Color::BLACK); Stage::GetCurrent().Add(actor); application.SendNotification(); @@ -2793,7 +2794,7 @@ static void TestTransform( ToolkitTestApplication& application, Visual::Base vis DummyControl actor = DummyControl::New(true); Impl::DummyControl& dummyImpl = static_cast(actor.GetImplementation()); actor.SetSize(2000, 2000); - actor.SetParentOrigin(ParentOrigin::CENTER); + actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); Stage::GetCurrent().Add(actor); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); @@ -3103,7 +3104,7 @@ int UtcDaliNPatchVisualCustomShader(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummyImpl.SetLayout( DummyControl::Property::TEST_VISUAL, transformMap ); dummy.SetSize(2000, 2000); - dummy.SetParentOrigin(ParentOrigin::CENTER); + dummy.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); Stage::GetCurrent().Add(dummy); application.SendNotification(); @@ -3247,7 +3248,7 @@ int UtcDaliVisualTextVisualRender(void) DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 0, TEST_LOCATION ); dummyControl.SetSize(200.f, 200.f); - dummyControl.SetParentOrigin( ParentOrigin::CENTER ); + dummyControl.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( dummyControl ); application.SendNotification(); @@ -3316,7 +3317,7 @@ int UtcDaliVisualTextVisualDisableEnable(void) DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 0, TEST_LOCATION ); dummyControl.SetSize(200.f, 200.f); - dummyControl.SetParentOrigin( ParentOrigin::CENTER ); + dummyControl.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( dummyControl ); application.SendNotification(); @@ -3599,7 +3600,7 @@ int UtcDaliSvgVisualCustomShader(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummy.SetSize( 200.f, 200.f ); - dummy.SetParentOrigin( ParentOrigin::CENTER ); + dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( dummy ); application.SendNotification(); @@ -3645,7 +3646,7 @@ int UtcDaliVisualRoundedCorner(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummy.SetSize( 200.f, 200.f ); - dummy.SetParentOrigin( ParentOrigin::CENTER ); + dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( dummy ); application.SendNotification(); @@ -3677,7 +3678,7 @@ int UtcDaliVisualRoundedCorner(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummy.SetSize( 200.f, 200.f ); - dummy.SetParentOrigin( ParentOrigin::CENTER ); + dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( dummy ); application.SendNotification(); @@ -3722,7 +3723,7 @@ int UtcDaliVisualRoundedCorner(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummy.SetSize( 200.f, 200.f ); - dummy.SetParentOrigin( ParentOrigin::CENTER ); + dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( dummy ); application.SendNotification(); @@ -3758,7 +3759,7 @@ int UtcDaliColorVisualBlurRadius(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummy.SetSize( 200.f, 200.f ); - dummy.SetParentOrigin( ParentOrigin::CENTER ); + dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( dummy ); application.SendNotification(); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp index c7f4282..513e132 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp @@ -1027,7 +1027,7 @@ int UtcDaliNPatchVisualAuxiliaryImage(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummyImpl.SetLayout( DummyControl::Property::TEST_VISUAL, transformMap ); dummy.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - dummy.SetParentOrigin(ParentOrigin::CENTER); + dummy.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); Stage::GetCurrent().Add(dummy); application.SendNotification(); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp index bb9e279..f12353a 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp @@ -144,8 +144,8 @@ int UtcDaliWebViewPageNavigation(void) ToolkitTestApplication application; WebView view = WebView::New(); - view.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - view.SetParentOrigin( ParentOrigin::TOP_LEFT ); + view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); view.SetPosition( 0, 0 ); view.SetSize( 800, 600 ); Stage::GetCurrent().Add( view ); @@ -215,8 +215,8 @@ int UtcDaliWebViewTouchAndKeys(void) ToolkitTestApplication application; WebView view = WebView::New(); - view.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - view.SetParentOrigin( ParentOrigin::TOP_LEFT ); + view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); view.SetPosition( 0, 0 ); view.SetSize( 800, 600 ); diff --git a/dali-toolkit/devel-api/builder/builder.h b/dali-toolkit/devel-api/builder/builder.h index 1f8ea4a..7c40be4 100755 --- a/dali-toolkit/devel-api/builder/builder.h +++ b/dali-toolkit/devel-api/builder/builder.h @@ -245,7 +245,7 @@ class DALI_TOOLKIT_API Builder : public BaseHandle * * e.g. * Property::Map map; - * map["ACTOR"] = actor.GetName(); // replaces '{ACTOR} in the template + * map["ACTOR"] = actor.GetProperty< std::string >( Dali::Actor::Property::NAME ); // replaces '{ACTOR} in the template * Animation a = builder.CreateAnimation( "wobble"); * * @pre The Builder has been initialized. @@ -281,7 +281,7 @@ class DALI_TOOLKIT_API Builder : public BaseHandle * The animation is applied to a specific actor. * e.g. * Property::Map map; - * map["ACTOR"] = actor.GetName(); // replaces '{ACTOR} in the template + * map["ACTOR"] = actor.GetProperty< std::string >( Dali::Actor::Property::NAME ); // replaces '{ACTOR} in the template * Actor myInstance = builder.Create( "templateActorTree" ) * Animation a = builder.CreateAnimation( "wobble", myInstance); * diff --git a/dali-toolkit/devel-api/controls/effects-view/effects-view.h b/dali-toolkit/devel-api/controls/effects-view/effects-view.h index 7079bd9..87b19d4 100644 --- a/dali-toolkit/devel-api/controls/effects-view/effects-view.h +++ b/dali-toolkit/devel-api/controls/effects-view/effects-view.h @@ -45,7 +45,7 @@ class EffectsView; * EffectsView effectsView = EffectsView::New( Toolkit::EffectsView::EMBOSS ); * * // set position and format - * effectsView.SetParentOrigin( ParentOrigin::CENTER ); + * effectsView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); * effectsView.SetSize( Vector2( width, height) ); * effectsView.SetPixelFormat( Pixel::RGBA8888 ); * diff --git a/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h b/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h index 52de248..6b4b9dd 100644 --- a/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h +++ b/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h @@ -67,13 +67,13 @@ class ShadowView; * // create and add some visible actors to the ShadowView, all these child actors will therefore cast a shadow. * Image image = Image::New(...); * ImageView imageView = ImageView::New(image); - * imageView.SetParentOrigin( ParentOrigin::CENTER ); - * imageView.SetAnchorPoint( AnchorPoint::CENTER ); + * imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + * imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); * shadowView.Add(imageView);\n Add the renderable actor to the shadow view * * ImageView shadowPlaneBg = ImageView::New(); //This will be the shadow plane - * shadowPlaneBg.SetParentOrigin( ParentOrigin::CENTER ); - * shadowPlaneBg.SetAnchorPoint( AnchorPoint::CENTER ); + * shadowPlaneBg.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + * shadowPlaneBg.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); * shadowPlaneBg.SetSize(700.0f, 700.0f); * shadowPlaneBg.SetPosition( Vector3(0.0f, 0.0f, -30.0f) ); //Just behind the image view. * shadowView.SetShadowPlaneBackground(ShadowPlane); diff --git a/dali-toolkit/devel-api/layouting/flex-node.cpp b/dali-toolkit/devel-api/layouting/flex-node.cpp index f13549c..cbac8b2 100644 --- a/dali-toolkit/devel-api/layouting/flex-node.cpp +++ b/dali-toolkit/devel-api/layouting/flex-node.cpp @@ -105,7 +105,7 @@ void Node::AddChild( Actor child, Extents margin, MeasureCallback measureFunctio { if( child ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "AddChild[%s] to node[%p] at index:%d\n", child.GetName().c_str(), mImpl->mYogaNode, index ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "AddChild[%s] to node[%p] at index:%d\n", child.GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str(), mImpl->mYogaNode, index ); NodePtr childNode( new Node() ); @@ -113,8 +113,8 @@ void Node::AddChild( Actor child, Extents margin, MeasureCallback measureFunctio childNode->mImpl->mMeasureCallback = measureFunction; childNode->mImpl->mActor = child; - Vector2 minumumSize = child.GetMinimumSize(); - Vector2 maximumSize = child.GetMaximumSize(); + Vector2 minumumSize = child.GetProperty< Vector2 >( Actor::Property::MINIMUM_SIZE ); + Vector2 maximumSize = child.GetProperty< Vector2 >( Actor::Property::MAXIMUM_SIZE ); YGNodeStyleSetMaxWidth( childNode->mImpl->mYogaNode, maximumSize.width ); YGNodeStyleSetMaxHeight( childNode->mImpl->mYogaNode, maximumSize.height ); @@ -136,7 +136,7 @@ void Node::AddChild( Actor child, Extents margin, MeasureCallback measureFunctio void Node::RemoveChild( Actor child ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "RemoveChild child:[%s] from internal nodeCount[%d] childCount[%d]\n", child.GetName().c_str(), YGNodeGetChildCount( mImpl->mYogaNode ), mImpl->mChildNodes.size() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "RemoveChild child:[%s] from internal nodeCount[%d] childCount[%d]\n", child.GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str(), YGNodeGetChildCount( mImpl->mYogaNode ), mImpl->mChildNodes.size() ); auto iterator = std::find_if( mImpl->mChildNodes.begin(),mImpl->mChildNodes.end(), [&child]( NodePtr& childNode ){ return childNode->mImpl->mActor.GetHandle() == child;}); @@ -158,7 +158,7 @@ SizeTuple Node::MeasureNode( float width, int widthMode, float height, int heigh Toolkit::Flex::SizeTuple nodeSize{8,8}; // Default size set to 8,8 to aid bug detection. if( mImpl->mMeasureCallback && mImpl->mActor.GetHandle() ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "MeasureNode MeasureCallback executing on %s\n", mImpl->mActor.GetHandle().GetName().c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "MeasureNode MeasureCallback executing on %s\n", mImpl->mActor.GetHandle().GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str() ); nodeSize = mImpl->mMeasureCallback( mImpl->mActor.GetHandle(), width, widthMode, height, heightMode ); } DALI_LOG_INFO( gLogFilter, Debug::Verbose, "MeasureNode nodeSize width:%f height:%f\n", nodeSize.width, nodeSize.height ); diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp index 7f69861..42952e3 100644 --- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp +++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp @@ -76,8 +76,8 @@ bool IsActorFocusableFunction(Actor actor, Dali::HitTestAlgorithm::TraverseType case Dali::HitTestAlgorithm::CHECK_ACTOR: { // Check whether the actor is visible and not fully transparent. - if( actor.IsVisible() - && actor.GetCurrentWorldColor().a > 0.01f) // not FULLY_TRANSPARENT + if( actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) + && actor.GetCurrentProperty< Vector4 >( Actor::Property::WORLD_COLOR ).a > 0.01f) // not FULLY_TRANSPARENT { // Check whether the actor is focusable Property::Index propertyActorFocusable = actor.GetPropertyIndex(ACTOR_FOCUSABLE); @@ -90,7 +90,7 @@ bool IsActorFocusableFunction(Actor actor, Dali::HitTestAlgorithm::TraverseType } case Dali::HitTestAlgorithm::DESCEND_ACTOR_TREE: { - if( actor.IsVisible() ) // Actor is visible, if not visible then none of its children are visible. + if( actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ) // Actor is visible, if not visible then none of its children are visible. { hittable = true; } @@ -331,16 +331,16 @@ bool AccessibilityManager::DoSetCurrentFocusActor(const unsigned int actorID) } // Go through the actor's hierarchy to check whether the actor is visible - bool actorVisible = actor.IsVisible(); + bool actorVisible = actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ); Actor parent = actor.GetParent(); while (actorVisible && parent && parent != rootActor) { - actorVisible = parent.IsVisible(); + actorVisible = parent.GetCurrentProperty< bool >( Actor::Property::VISIBLE ); parent = parent.GetParent(); } // Check whether the actor is fully transparent - bool actorOpaque = actor.GetCurrentWorldColor().a > 0.01f; + bool actorOpaque = actor.GetCurrentProperty< Vector4 >( Actor::Property::WORLD_COLOR ).a > 0.01f; // Set the focus only when the actor is focusable and visible and not fully transparent if(actorVisible && actorFocusable && actorOpaque) @@ -610,7 +610,7 @@ Actor AccessibilityManager::GetFocusIndicatorActor() const std::string focusBorderImagePath = imageDirPath + FOCUS_BORDER_IMAGE_FILE_NAME; mFocusIndicatorActor = Toolkit::ImageView::New(focusBorderImagePath); - mFocusIndicatorActor.SetParentOrigin( ParentOrigin::CENTER ); + mFocusIndicatorActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mFocusIndicatorActor.SetZ( 1.0f ); // Apply size constraint to the focus indicator diff --git a/dali-toolkit/internal/builder/builder-signals.cpp b/dali-toolkit/internal/builder/builder-signals.cpp index 9138e9b..c177385 100755 --- a/dali-toolkit/internal/builder/builder-signals.cpp +++ b/dali-toolkit/internal/builder/builder-signals.cpp @@ -636,7 +636,7 @@ void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor, { // no named actor; presume self GenericAction action; - action.actorName = actor.GetName(); + action.actorName = actor.GetProperty< std::string >( Dali::Actor::Property::NAME ); action.actionName = *actionName; GetParameters(child, action.parameters); connector.Connect( action ); @@ -711,7 +711,7 @@ Actor SetupSignalAction(ConnectionTracker* tracker, const TreeNode &root, const { const TreeNode::KeyNodePair& key_child = *iter; - DALI_SCRIPT_INFO(" Creating Signal for: %s\n", actor.GetName().c_str()); + DALI_SCRIPT_INFO(" Creating Signal for: %s\n", actor.GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str()); OptionalString name( IsString( IsChild( key_child.second, "name")) ); DALI_ASSERT_ALWAYS(name && "Signal must have a name"); diff --git a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp index 6641d26..07186e0 100644 --- a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp +++ b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp @@ -215,8 +215,8 @@ void Alignment::OnRelayout( const Vector2& size, RelayoutContainer& container ) { Actor child = Self().GetChildAt(i); - child.SetAnchorPoint( anchorPointAndParentOrigin ); - child.SetParentOrigin( anchorPointAndParentOrigin ); + child.SetProperty( Actor::Property::ANCHOR_POINT, anchorPointAndParentOrigin ); + child.SetProperty( Actor::Property::PARENT_ORIGIN, anchorPointAndParentOrigin ); Vector2 currentChildSize( child.GetTargetSize().GetVectorXY() ); if( currentChildSize == Vector2::ZERO ) diff --git a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp index 14f179b..6cd10b0 100644 --- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp +++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp @@ -222,40 +222,40 @@ Toolkit::BloomView BloomView::New(const unsigned int blurNumSamples, const float void BloomView::OnInitialize() { // root actor to parent all user added actors, needed to allow us to set that subtree as exclusive for our child render task - mChildrenRoot.SetParentOrigin( ParentOrigin::CENTER ); - mInternalRoot.SetParentOrigin( ParentOrigin::CENTER ); + mChildrenRoot.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mInternalRoot.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); ////////////////////////////////////////////////////// // Create actors // Create an image view for rendering from the scene texture to the bloom texture mBloomExtractActor = Actor::New(); - mBloomExtractActor.SetParentOrigin( ParentOrigin::CENTER ); + mBloomExtractActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); // Create an image view for compositing the result (scene and bloom textures) to output mCompositeActor = Actor::New(); - mCompositeActor.SetParentOrigin( ParentOrigin::CENTER ); + mCompositeActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); // Create an image view for holding final result, i.e. the blurred image. This will get rendered to screen later, via default / user render task mTargetActor = Actor::New(); - mTargetActor.SetParentOrigin( ParentOrigin::CENTER ); + mTargetActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); // Create the Gaussian Blur object + render tasks // Note that we use mBloomExtractTarget as the source image and also re-use this as the gaussian blur final render target. This saves the gaussian blur code from creating it // render targets etc internally, so we make better use of resources // Note, this also internally creates the render tasks used by the Gaussian blur, this must occur after the bloom extraction and before the compositing mGaussianBlurView = Dali::Toolkit::GaussianBlurView::New(mBlurNumSamples, mBlurBellCurveWidth, mPixelFormat, mDownsampleWidthScale, mDownsampleHeightScale, true); - mGaussianBlurView.SetParentOrigin( ParentOrigin::CENTER ); + mGaussianBlurView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); ////////////////////////////////////////////////////// // Create cameras for the renders corresponding to the (potentially downsampled) render targets' size mRenderDownsampledCamera = CameraActor::New(); - mRenderDownsampledCamera.SetParentOrigin(ParentOrigin::CENTER); + mRenderDownsampledCamera.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); mRenderDownsampledCamera.SetInvertYAxis( true ); mRenderFullSizeCamera = CameraActor::New(); - mRenderFullSizeCamera.SetParentOrigin(ParentOrigin::CENTER); + mRenderFullSizeCamera.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); mRenderFullSizeCamera.SetInvertYAxis( true ); @@ -355,7 +355,7 @@ void BloomView::AllocateResources() mGaussianBlurView.SetSize(mTargetSize); GetImpl(mGaussianBlurView).AllocateResources(); - mGaussianBlurView.SetVisible( true ); + mGaussianBlurView.SetProperty( Actor::Property::VISIBLE, true ); ////////////////////////////////////////////////////// // Create render targets @@ -473,7 +473,7 @@ void BloomView::Deactivate() mTargetActor.RemoveRenderer( 0u ); mCompositeActor.RemoveRenderer( 0u ); - mGaussianBlurView.SetVisible( false ); + mGaussianBlurView.SetProperty( Actor::Property::VISIBLE, false ); mActivated = false; } diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp index d4c46ea..81ab78b 100644 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp @@ -238,7 +238,7 @@ void BubbleEmitter::OnInitialize() // Create a cameraActor for the off screen render task. mCameraActor = CameraActor::New(mMovementArea); - mCameraActor.SetParentOrigin(ParentOrigin::CENTER); + mCameraActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage stage = Stage::GetCurrent(); @@ -259,7 +259,7 @@ void BubbleEmitter::SetBackground( Texture bgTexture, const Vector3& hsvDelta ) //Create RenderTask source actor Actor sourceActor = Actor::New(); sourceActor.SetSize( mMovementArea ); - sourceActor.SetParentOrigin(ParentOrigin::CENTER); + sourceActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); sourceActor.RegisterProperty( "uHSVDelta", hsvDelta ); Stage::GetCurrent().Add( sourceActor ); diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp index f263489..612d010 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp @@ -112,7 +112,7 @@ void PushButton::OnInitialize() // Push button requires the Leave event. Actor self = Self(); - self.SetLeaveRequired( true ); + self.SetProperty( Actor::Property::LEAVE_REQUIRED, true ); } void PushButton::SetIconAlignment( const PushButton::IconAlignment iconAlignment ) diff --git a/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp b/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp index 6aaf423..dca592a 100755 --- a/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp @@ -110,7 +110,7 @@ void ToggleButton::OnInitialize() // Toggle button requires the Leave event. Actor self = Self(); - self.SetLeaveRequired( true ); + self.SetProperty( Actor::Property::LEAVE_REQUIRED, true ); } void ToggleButton::SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value ) diff --git a/dali-toolkit/internal/controls/control/control-debug.cpp b/dali-toolkit/internal/controls/control/control-debug.cpp index a359dee..8afaa03 100644 --- a/dali-toolkit/internal/controls/control/control-debug.cpp +++ b/dali-toolkit/internal/controls/control/control-debug.cpp @@ -287,7 +287,7 @@ std::string DumpControl( const Internal::Control& control ) std::ostringstream oss; oss << "{\n "; - const std::string& name = control.Self().GetName(); + const std::string& name = control.Self().GetProperty< std::string >( Dali::Actor::Property::NAME ); if( ! name.empty() ) { oss << "\"name\":\"" << name << "\",\n"; @@ -306,7 +306,7 @@ std::string DumpActor( Actor actor ) { std::ostringstream oss; oss << "{\n "; - const std::string& name = actor.GetName(); + const std::string& name = actor.GetProperty< std::string >( Dali::Actor::Property::NAME ); if( ! name.empty() ) { oss << "\"name\":\"" << name << "\",\n"; diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp index 0c34673..d4e96a7 100644 --- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp +++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp @@ -265,7 +265,7 @@ int EffectsView::GetEffectSize() void EffectsView::OnInitialize() { CustomActor self = Self(); - mChildrenRoot.SetParentOrigin( ParentOrigin::CENTER ); + mChildrenRoot.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); self.Add( mChildrenRoot ); } @@ -450,7 +450,7 @@ void EffectsView::SetupCameras() { // Create a camera for the children render, corresponding to its render target size mCameraForChildren = CameraActor::New(mTargetSize); - mCameraForChildren.SetParentOrigin(ParentOrigin::CENTER); + mCameraForChildren.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); mCameraForChildren.SetInvertYAxis( true ); Self().Add( mCameraForChildren ); } diff --git a/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp b/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp index 1488f5e..98d801b 100755 --- a/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp +++ b/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp @@ -517,9 +517,9 @@ void FlexContainer::OnRelayout( const Vector2& size, RelayoutContainer& containe // Anchor actor to top left of the container if( child.GetProperty( DevelActor::Property::POSITION_USES_ANCHOR_POINT ).Get< bool >() ) { - child.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + child.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); } - child.SetParentOrigin( ParentOrigin::TOP_LEFT ); + child.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); float negotiatedWidth = child.GetRelayoutSize(Dimension::WIDTH); float negotiatedHeight = child.GetRelayoutSize(Dimension::HEIGHT); @@ -618,10 +618,10 @@ void FlexContainer::ComputeLayout() Actor childActor = mChildrenNodes[i].actor.GetHandle(); // Intialize the style of the child. - YGNodeStyleSetMinWidth( childNode, childActor.GetMinimumSize().x ); - YGNodeStyleSetMinHeight( childNode, childActor.GetMinimumSize().y ); - YGNodeStyleSetMaxWidth( childNode, childActor.GetMaximumSize().x ); - YGNodeStyleSetMaxHeight( childNode, childActor.GetMaximumSize().y ); + YGNodeStyleSetMinWidth( childNode, childActor.GetProperty< Vector2 >( Actor::Property::MINIMUM_SIZE ).x ); + YGNodeStyleSetMinHeight( childNode, childActor.GetProperty< Vector2 >( Actor::Property::MINIMUM_SIZE ).y ); + YGNodeStyleSetMaxWidth( childNode, childActor.GetProperty< Vector2 >( Actor::Property::MAXIMUM_SIZE ).x ); + YGNodeStyleSetMaxHeight( childNode, childActor.GetProperty< Vector2 >( Actor::Property::MAXIMUM_SIZE ).y ); // Check child properties on the child for how to layout it. // These properties should be dynamically registered to the child which @@ -687,7 +687,7 @@ void FlexContainer::ComputeLayout() #if defined(FLEX_CONTAINER_DEBUG) YGNodePrint( mRootNode.node, (YGPrintOptions)( YGPrintOptionsLayout | YGPrintOptionsStyle | YGPrintOptionsChildren ) ); #endif - YGNodeCalculateLayout( mRootNode.node, Self().GetMaximumSize().x, Self().GetMaximumSize().y, nodeLayoutDirection ); + YGNodeCalculateLayout( mRootNode.node, Self().GetProperty< Vector2 >( Actor::Property::MAXIMUM_SIZE ).x, Self().GetProperty< Vector2 >( Actor::Property::MAXIMUM_SIZE ).y, nodeLayoutDirection ); #if defined(FLEX_CONTAINER_DEBUG) YGNodePrint( mRootNode.node, (YGPrintOptions)( YGPrintOptionsLayout | YGPrintOptionsStyle | YGPrintOptionsChildren ) ); #endif diff --git a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp index 233a79c..62aca10 100644 --- a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp +++ b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp @@ -32,6 +32,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -259,8 +260,8 @@ Vector4 GaussianBlurView::GetBackgroundColor() const void GaussianBlurView::OnInitialize() { // root actor to parent all user added actors, needed to allow us to set that subtree as exclusive for our child render task - mChildrenRoot.SetParentOrigin(ParentOrigin::CENTER); - mInternalRoot.SetParentOrigin(ParentOrigin::CENTER); + mChildrenRoot.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); + mInternalRoot.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); ////////////////////////////////////////////////////// // Create shaders @@ -275,13 +276,13 @@ void GaussianBlurView::OnInitialize() // Create an actor for performing a horizontal blur on the texture mHorizBlurActor = Actor::New(); - mHorizBlurActor.SetParentOrigin(ParentOrigin::CENTER); + mHorizBlurActor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); Renderer renderer = CreateRenderer( BASIC_VERTEX_SOURCE, fragmentSource.c_str() ); mHorizBlurActor.AddRenderer( renderer ); // Create an actor for performing a vertical blur on the texture mVertBlurActor = Actor::New(); - mVertBlurActor.SetParentOrigin(ParentOrigin::CENTER); + mVertBlurActor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); renderer = CreateRenderer( BASIC_VERTEX_SOURCE, fragmentSource.c_str() ); mVertBlurActor.AddRenderer( renderer ); @@ -293,8 +294,8 @@ void GaussianBlurView::OnInitialize() if(!mBlurUserImage) { mCompositingActor = Actor::New(); - mCompositingActor.SetParentOrigin(ParentOrigin::CENTER); - mCompositingActor.SetOpacity(GAUSSIAN_BLUR_VIEW_DEFAULT_BLUR_STRENGTH); // ensure alpha is enabled for this object and set default value + mCompositingActor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); + mCompositingActor.SetProperty( DevelActor::Property::OPACITY,GAUSSIAN_BLUR_VIEW_DEFAULT_BLUR_STRENGTH); // ensure alpha is enabled for this object and set default value renderer = CreateRenderer( BASIC_VERTEX_SOURCE, BASIC_FRAGMENT_SOURCE ); mCompositingActor.AddRenderer( renderer ); @@ -304,7 +305,7 @@ void GaussianBlurView::OnInitialize() // Create an image view for holding final result, i.e. the blurred image. This will get rendered to screen later, via default / user render task mTargetActor = Actor::New(); - mTargetActor.SetParentOrigin(ParentOrigin::CENTER); + mTargetActor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); renderer = CreateRenderer( BASIC_VERTEX_SOURCE, BASIC_FRAGMENT_SOURCE ); mTargetActor.AddRenderer( renderer ); @@ -312,7 +313,7 @@ void GaussianBlurView::OnInitialize() // Create cameras for the renders corresponding to the view size mRenderFullSizeCamera = CameraActor::New(); mRenderFullSizeCamera.SetInvertYAxis( true ); - mRenderFullSizeCamera.SetParentOrigin(ParentOrigin::CENTER); + mRenderFullSizeCamera.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); ////////////////////////////////////////////////////// // Connect to actor tree @@ -325,7 +326,7 @@ void GaussianBlurView::OnInitialize() // Create camera for the renders corresponding to the (potentially downsampled) render targets' size mRenderDownsampledCamera = CameraActor::New(); mRenderDownsampledCamera.SetInvertYAxis( true ); - mRenderDownsampledCamera.SetParentOrigin(ParentOrigin::CENTER); + mRenderDownsampledCamera.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); ////////////////////////////////////////////////////// // Connect to actor tree diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp index f4ad54f..c0629c3 100644 --- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp +++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp @@ -172,7 +172,7 @@ void Magnifier::Initialize() // and what is not. mSourceActor = Actor::New(); Stage().GetCurrent().Add(mSourceActor); - mSourceActor.SetParentOrigin(ParentOrigin::CENTER); + mSourceActor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); Constraint constraint = Constraint::New( mSourceActor, Actor::Property::POSITION, EqualToConstraint() ); constraint.AddSource( Source( self, Toolkit::Magnifier::Property::SOURCE_POSITION ) ); constraint.Apply(); @@ -259,8 +259,8 @@ void Magnifier::SetFrameVisibility(bool visible) Actor self(Self()); mFrame = Actor::New( ); - mFrame.SetInheritPosition(false); - mFrame.SetInheritScale(true); + mFrame.SetProperty( Actor::Property::INHERIT_POSITION, false ); + mFrame.SetProperty( Actor::Property::INHERIT_SCALE, true ); mFrame.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS ); Vector3 sizeOffset(IMAGE_BORDER_INDENT*2.f - 2.f, IMAGE_BORDER_INDENT*2.f - 2.f, 0.0f); mFrame.SetSizeModeFactor( sizeOffset ); @@ -317,7 +317,7 @@ void Magnifier::Update() // should be updated when: // Magnifier's world size/scale changes. Actor self(Self()); - Vector3 worldSize = mActorSize * self.GetCurrentWorldScale(); + Vector3 worldSize = mActorSize * self.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_SCALE ); // Adjust field of view to scale content diff --git a/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp b/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp index 5ddf48c..028f726 100644 --- a/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp +++ b/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp @@ -73,7 +73,7 @@ Toolkit::NavigationView NavigationView::New() void NavigationView::OnStageConnection( int depth ) { - Self().SetSensitive(true); + Self().SetProperty( Actor::Property::SENSITIVE,true); Control::OnStageConnection( depth ); } diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp index 5bc97dc..7ff12f7 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp @@ -69,12 +69,12 @@ void PageTurnLandscapeView::OnPageTurnViewInitialize() mControlSize = Vector2( mPageSize.width * 2.f, mPageSize.height ); Self().SetSize( mControlSize ); - mTurningPageLayer.SetParentOrigin( ParentOrigin::CENTER ); + mTurningPageLayer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); } void PageTurnLandscapeView::OnAddPage( Actor newPage, bool isLeftSide ) { - newPage.SetParentOrigin( ParentOrigin::CENTER ); + newPage.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); } Vector2 PageTurnLandscapeView::SetPanPosition( const Vector2& gesturePosition ) diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp index 4bde36a..b4bc45a 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp @@ -79,7 +79,7 @@ void PageTurnPortraitView::OnPageTurnViewInitialize() mControlSize = mPageSize; Self().SetSize( mPageSize ); - mTurningPageLayer.SetParentOrigin( ParentOrigin::CENTER_LEFT ); + mTurningPageLayer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_LEFT ); } Vector2 PageTurnPortraitView::SetPanPosition( const Vector2& gesturePosition ) @@ -125,7 +125,7 @@ void PageTurnPortraitView::OnPossibleOutwardsFlick( const Vector2& panPosition, OrganizePageDepth(); mPageUpdated = true; - actor.SetVisible(true); + actor.SetProperty( Actor::Property::VISIBLE,true); // Add the page to tuning page layer and set up PageTurnEffect mShadowView.Add( actor ); @@ -154,7 +154,7 @@ void PageTurnPortraitView::OnTurnedOver( Actor actor, bool isLeftSide ) { if( isLeftSide ) { - actor.SetVisible( false ); + actor.SetProperty( Actor::Property::VISIBLE, false ); } } diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp index 7a00f87..6cb28d6 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp @@ -263,9 +263,9 @@ PageTurnView::Page::Page() : isTurnBack( false ) { actor = Actor::New(); - actor.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); - actor.SetParentOrigin( ParentOrigin::CENTER_LEFT ); - actor.SetVisible( false ); + actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER_LEFT ); + actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_LEFT ); + actor.SetProperty( Actor::Property::VISIBLE, false ); propertyPanDisplacement = actor.RegisterProperty( PROPERTY_PAN_DISPLACEMENT, 0.f ); propertyPanCenter = actor.RegisterProperty(PROPERTY_PAN_CENTER, Vector2::ZERO); @@ -394,7 +394,7 @@ void PageTurnView::OnInitialize() // create the layer for turning pages mTurningPageLayer = Layer::New(); - mTurningPageLayer.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); + mTurningPageLayer.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER_LEFT ); mTurningPageLayer.SetBehavior(Layer::LAYER_3D); mTurningPageLayer.Raise(); @@ -410,7 +410,7 @@ void PageTurnView::OnInitialize() AddPage( i ); mPages[i].actor.SetZ( -static_cast( i )*STATIC_PAGE_INTERVAL_DISTANCE ); } - mPages[0].actor.SetVisible(true); + mPages[0].actor.SetProperty( Actor::Property::VISIBLE,true); // enable the pan gesture which is attached to the control EnableGestureDetection(Gesture::Type(Gesture::Pan)); @@ -448,21 +448,21 @@ Shader PageTurnView::CreateShader( const Property::Map& shaderMap ) void PageTurnView::SetupShadowView() { mShadowView = Toolkit::ShadowView::New( 0.25f, 0.25f ); - Vector3 origin = mTurningPageLayer.GetCurrentParentOrigin(); - mShadowView.SetParentOrigin( origin ); - mShadowView.SetAnchorPoint( origin ); + Vector3 origin = mTurningPageLayer.GetCurrentProperty< Vector3 >( Actor::Property::PARENT_ORIGIN ); + mShadowView.SetProperty( Actor::Property::PARENT_ORIGIN, origin ); + mShadowView.SetProperty( Actor::Property::ANCHOR_POINT, origin ); mShadowView.SetPointLightFieldOfView( Math::PI / 2.0f); mShadowView.SetShadowColor(DEFAULT_SHADOW_COLOR); mShadowPlaneBackground = Actor::New(); - mShadowPlaneBackground.SetParentOrigin( ParentOrigin::CENTER ); + mShadowPlaneBackground.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mShadowPlaneBackground.SetSize( mControlSize ); Self().Add( mShadowPlaneBackground ); mShadowView.SetShadowPlaneBackground( mShadowPlaneBackground ); mPointLight = Actor::New(); - mPointLight.SetAnchorPoint( origin ); - mPointLight.SetParentOrigin( origin ); + mPointLight.SetProperty( Actor::Property::ANCHOR_POINT, origin ); + mPointLight.SetProperty( Actor::Property::PARENT_ORIGIN, origin ); mPointLight.SetPosition( 0.f, 0.f, mPageSize.width*POINT_LIGHT_HEIGHT_RATIO ); Self().Add( mPointLight ); mShadowView.SetPointLight( mPointLight ); @@ -557,10 +557,10 @@ void PageTurnView::GoToPage( unsigned int pageId ) AddPage( i ); } - mPages[pageId%NUMBER_OF_CACHED_PAGES].actor.SetVisible(true); + mPages[pageId%NUMBER_OF_CACHED_PAGES].actor.SetProperty( Actor::Property::VISIBLE,true); if( pageId > 0 ) { - mPages[(pageId-1)%NUMBER_OF_CACHED_PAGES].actor.SetVisible(true); + mPages[(pageId-1)%NUMBER_OF_CACHED_PAGES].actor.SetProperty( Actor::Property::VISIBLE,true); } // set ordered depth to the stacked pages OrganizePageDepth(); @@ -590,7 +590,7 @@ void PageTurnView::AddPage( int pageIndex ) float degree = isLeftSide ? 180.f :0.f; mPages[index].actor.SetOrientation( Degree( degree ), Vector3::YAXIS ); - mPages[index].actor.SetVisible( false ); + mPages[index].actor.SetProperty( Actor::Property::VISIBLE, false ); mPages[index].UseEffect( mSpineEffectShader, mGeometry ); mPages[index].SetTexture( newPage ); @@ -605,7 +605,7 @@ void PageTurnView::RemovePage( int pageIndex ) if( pageIndex > -1 && pageIndex < mTotalPageCount) { int index = pageIndex % NUMBER_OF_CACHED_PAGES; - mPages[index].actor.SetVisible(false); + mPages[index].actor.SetProperty( Actor::Property::VISIBLE,false); } } @@ -712,7 +712,7 @@ void PageTurnView::PanContinuing( const Vector2& gesturePosition ) int id = mTurningPageIndex + (mPages[mIndex].isTurnBack ? -1 : 1); if( id >=0 && id < mTotalPageCount ) { - mPages[id%NUMBER_OF_CACHED_PAGES].actor.SetVisible(true); + mPages[id%NUMBER_OF_CACHED_PAGES].actor.SetProperty( Actor::Property::VISIBLE,true); } mShadowView.RemoveConstraints(); @@ -910,7 +910,7 @@ void PageTurnView::TurnedOver( Animation& animation ) int id = pageId + (mPages[index].isTurnBack ? -1 : 1); if( id >=0 && id < mTotalPageCount ) { - mPages[id%NUMBER_OF_CACHED_PAGES].actor.SetVisible(false); + mPages[id%NUMBER_OF_CACHED_PAGES].actor.SetProperty( Actor::Property::VISIBLE,false); } OnTurnedOver( mPages[index].actor, mPages[index].isTurnBack ); @@ -934,7 +934,7 @@ void PageTurnView::SliddenBack( Animation& animation ) int id = pageId + (mPages[index].isTurnBack ? -1 : 1); if( id >=0 && id < mTotalPageCount ) { - mPages[id%NUMBER_OF_CACHED_PAGES].actor.SetVisible(false); + mPages[id%NUMBER_OF_CACHED_PAGES].actor.SetProperty( Actor::Property::VISIBLE,false); } // Guard against destruction during signal emission diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp index e11c89f..8672c4a 100644 --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -21,6 +21,7 @@ // EXTERNAL INCLUDES #include // for strcmp #include +#include #include #include #include @@ -98,8 +99,8 @@ BaseHandle CreateToast() popup.SetProperty( Toolkit::Popup::Property::AUTO_HIDE_DELAY, DEFAULT_TOAST_AUTO_HIDE_DELAY ); // Align to the bottom of the screen. - popup.SetParentOrigin( DEFAULT_TOAST_BOTTOM_PARENT_ORIGIN ); - popup.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); + popup.SetProperty( Actor::Property::PARENT_ORIGIN, DEFAULT_TOAST_BOTTOM_PARENT_ORIGIN ); + popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); // Let events pass through the toast popup. popup.SetProperty( Toolkit::Popup::Property::TOUCH_TRANSPARENT, true ); @@ -275,11 +276,11 @@ Popup::Popup() void Popup::OnInitialize() { Actor self = Self(); - self.SetName( "popup" ); + self.SetProperty( Dali::Actor::Property::NAME, "popup" ); // Apply some default resizing rules. - self.SetParentOrigin( ParentOrigin::CENTER ); - self.SetAnchorPoint( AnchorPoint::CENTER ); + self.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + self.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); self.SetSizeModeFactor( DEFAULT_POPUP_PARENT_RELATIVE_SIZE ); self.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::WIDTH ); @@ -287,15 +288,15 @@ void Popup::OnInitialize() // Create a new layer so all Popup components can appear above all other actors. mLayer = Layer::New(); - mLayer.SetName( "popupLayer" ); + mLayer.SetProperty( Dali::Actor::Property::NAME, "popupLayer" ); - mLayer.SetParentOrigin( ParentOrigin::CENTER ); - mLayer.SetAnchorPoint( AnchorPoint::CENTER ); + mLayer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mLayer.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); mLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); // Important to set as invisible as otherwise, if the popup is parented, // but not shown yet it will appear statically on the screen. - mLayer.SetVisible( false ); + mLayer.SetProperty( Actor::Property::VISIBLE, false ); // Add the layer to the hierarchy. self.Add( mLayer ); @@ -305,9 +306,9 @@ void Popup::OnInitialize() mLayer.Add( mBacking ); mPopupContainer = Actor::New(); - mPopupContainer.SetName( "popupContainer" ); - mPopupContainer.SetParentOrigin( ParentOrigin::CENTER ); - mPopupContainer.SetAnchorPoint( AnchorPoint::CENTER ); + mPopupContainer.SetProperty( Dali::Actor::Property::NAME, "popupContainer" ); + mPopupContainer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mPopupContainer.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); mPopupContainer.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); mLayer.Add( mPopupContainer ); @@ -318,9 +319,9 @@ void Popup::OnInitialize() const std::string imageDirPath = AssetManager::GetDaliImagePath(); SetPopupBackgroundImage( Toolkit::ImageView::New( imageDirPath + DEFAULT_BACKGROUND_IMAGE_FILE_NAME ) ); - mPopupLayout.SetName( "popupLayoutTable" ); - mPopupLayout.SetParentOrigin( ParentOrigin::CENTER ); - mPopupLayout.SetAnchorPoint( AnchorPoint::CENTER ); + mPopupLayout.SetProperty( Dali::Actor::Property::NAME, "popupLayoutTable" ); + mPopupLayout.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mPopupLayout.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); mPopupLayout.SetResizePolicy( ResizePolicy::USE_ASSIGNED_SIZE, Dimension::WIDTH ); mPopupLayout.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); @@ -360,7 +361,7 @@ void Popup::LayoutAnimation() case Toolkit::Popup::FADE: { // Fade animations start transparent. - mPopupContainer.SetOpacity( 0.0f ); + mPopupContainer.SetProperty( DevelActor::Property::OPACITY, 0.0f ); break; } @@ -455,7 +456,7 @@ void Popup::StartTransitionAnimation( bool transitionIn, bool instantaneous /* f } else { - mPopupContainer.SetOpacity( transitionIn ? 1.0f : 0.0f ); + mPopupContainer.SetProperty( DevelActor::Property::OPACITY, transitionIn ? 1.0f : 0.0f ); } break; } @@ -537,8 +538,8 @@ void Popup::DisplayStateChangeComplete() { mDisplayState = Toolkit::Popup::HIDDEN; - mLayer.SetVisible( false ); - mPopupLayout.SetSensitive( false ); + mLayer.SetProperty( Actor::Property::VISIBLE, false ); + mPopupLayout.SetProperty( Actor::Property::SENSITIVE, false ); // Guard against destruction during signal emission. Toolkit::Popup handle( GetOwner() ); @@ -588,9 +589,9 @@ void Popup::SetPopupBackgroundImage( Actor image ) // Adds new background to the dialog. mPopupBackgroundImage = image; - mPopupBackgroundImage.SetName( "popupBackgroundImage" ); - mPopupBackgroundImage.SetAnchorPoint( AnchorPoint::CENTER ); - mPopupBackgroundImage.SetParentOrigin( ParentOrigin::CENTER ); + mPopupBackgroundImage.SetProperty( Dali::Actor::Property::NAME, "popupBackgroundImage" ); + mPopupBackgroundImage.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + mPopupBackgroundImage.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); // OnDialogTouched only consumes the event. It prevents the touch event to be caught by the backing. mPopupBackgroundImage.TouchSignal().Connect( this, &Popup::OnDialogTouched ); @@ -661,7 +662,7 @@ void Popup::SetContent( Actor content ) if( mContent ) { - mContent.SetName( "popupContent" ); + mContent.SetProperty( Dali::Actor::Property::NAME, "popupContent" ); mPopupLayout.AddChild( mContent, Toolkit::TableView::CellPosition( 1, 0 ) ); } @@ -728,7 +729,7 @@ void Popup::SetDisplayState( Toolkit::Popup::DisplayState displayState ) // We are displaying so bring the popup layer to the front, and set it visible so it is rendered. mLayer.RaiseToTop(); - mLayer.SetVisible( true ); + mLayer.SetProperty( Actor::Property::VISIBLE, true ); // Set up the layout if this is the first display or the layout has become dirty. if( mLayoutDirty ) @@ -738,7 +739,7 @@ void Popup::SetDisplayState( Toolkit::Popup::DisplayState displayState ) } // Allow the popup to catch events. - mPopupLayout.SetSensitive( true ); + mPopupLayout.SetProperty( Actor::Property::SENSITIVE, true ); // Handle the keyboard focus when popup is shown. Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get(); @@ -814,8 +815,8 @@ void Popup::LayoutPopup() * | |```` * | | */ - mPopupContainer.SetParentOrigin( Self().GetCurrentParentOrigin() ); - mPopupContainer.SetAnchorPoint( Self().GetCurrentAnchorPoint() ); + mPopupContainer.SetProperty( Actor::Property::PARENT_ORIGIN, Self().GetCurrentProperty< Vector3 >( Actor::Property::PARENT_ORIGIN ) ); + mPopupContainer.SetProperty( Actor::Property::ANCHOR_POINT, Self().GetCurrentProperty< Vector3 >( Actor::Property::ANCHOR_POINT ) ); // If there is only a title, use less padding. if( mTitle ) @@ -834,7 +835,7 @@ void Popup::LayoutPopup() OnLayoutSetup(); // Update background visibility. - mPopupContainer.SetVisible( !( !mFooter && mPopupLayout.GetChildCount() == 0 ) ); + mPopupContainer.SetProperty( Actor::Property::VISIBLE, !( !mFooter && mPopupLayout.GetChildCount() == 0 ) ); // Create / destroy / position the tail as needed. LayoutTail(); @@ -894,9 +895,9 @@ void Popup::LayoutTail() { // Adds the tail actor. mTailImage = Toolkit::ImageView::New( image ); - mTailImage.SetName( "tailImage" ); - mTailImage.SetParentOrigin( parentOrigin ); - mTailImage.SetAnchorPoint( anchorPoint ); + mTailImage.SetProperty( Dali::Actor::Property::NAME, "tailImage" ); + mTailImage.SetProperty( Actor::Property::PARENT_ORIGIN, parentOrigin ); + mTailImage.SetProperty( Actor::Property::ANCHOR_POINT, anchorPoint ); mTailImage.SetPosition( position ); if( mPopupBackgroundImage ) @@ -923,17 +924,17 @@ Toolkit::Control Popup::CreateBacking() backing.SetProperty( Toolkit::Control::Property::BACKGROUND, Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR ) .Add( Toolkit::ColorVisual::Property::MIX_COLOR, Vector4( mBackingColor.r, mBackingColor.g, mBackingColor.b, 1.0f ) ) ); - backing.SetName( "popupBacking" ); + backing.SetProperty( Dali::Actor::Property::NAME, "popupBacking" ); // Must always be positioned top-left of stage, regardless of parent. - backing.SetInheritPosition(false); + backing.SetProperty( Actor::Property::INHERIT_POSITION, false ); // Always the full size of the stage. backing.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); backing.SetSize( Stage::GetCurrent().GetSize() ); // Catch events. - backing.SetSensitive( true ); + backing.SetProperty( Actor::Property::SENSITIVE, true ); // Default to being transparent. backing.SetProperty( Actor::Property::COLOR_ALPHA, 0.0f ); @@ -1615,14 +1616,14 @@ void Popup::LayoutContext( const Vector2& size ) return; } - mPopupContainer.SetParentOrigin( ParentOrigin::CENTER ); + mPopupContainer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); // We always anchor to the CENTER, rather than a different anchor point for each contextual // mode to allow code-reuse of the bound checking code (for maintainability). - mPopupContainer.SetAnchorPoint( AnchorPoint::CENTER ); + mPopupContainer.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); // Setup with some pre-calculations for speed. Vector3 halfStageSize( Stage().GetCurrent().GetSize() / 2.0f ); - Vector3 parentPosition( parent.GetCurrentPosition() ); + Vector3 parentPosition( parent.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ) ); Vector2 halfSize( size / 2.0f ); Vector2 halfParentSize( parent.GetRelayoutSize( Dimension::WIDTH ) / 2.0f, parent.GetRelayoutSize( Dimension::HEIGHT ) / 2.0f ); Vector3 newPosition( Vector3::ZERO ); @@ -1871,7 +1872,7 @@ Actor Popup::GetNextKeyboardFocusableActor( Actor currentFocusedActor, Toolkit:: std::string currentStr; if( currentFocusedActor ) { - currentStr = currentFocusedActor.GetName(); + currentStr = currentFocusedActor.GetProperty< std::string >( Dali::Actor::Property::NAME ); } Actor nextFocusableActor( currentFocusedActor ); diff --git a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp index 291b95f..693944f 100644 --- a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp +++ b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp @@ -1291,8 +1291,8 @@ void Loader::LoadCamera( Scene3dView& scene3dView ) } CameraActor cameraActor = CameraActor::New(); - cameraActor.SetParentOrigin( ParentOrigin::CENTER ); - cameraActor.SetAnchorPoint( AnchorPoint::CENTER ); + cameraActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + cameraActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); if( cameraInfo.type == "orthographic" ) { @@ -1428,7 +1428,7 @@ bool Loader::LoadSceneNodes( Scene3dView& scene3dView ) for( auto nodeIter = tempNode->CBegin(), end = tempNode->CEnd(); nodeIter != end; ++nodeIter ) { Actor actor = AddNode( scene3dView, ( ( *nodeIter ).second ).GetInteger() ); - actor.SetParentOrigin( ParentOrigin::CENTER ); + actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); scene3dView.GetRoot().Add( actor ); } @@ -1581,7 +1581,7 @@ Actor Loader::AddNode( Scene3dView& scene3dView, uint32_t index ) renderer.SetTextures( textureSet ); anchorPoint = meshInfo.pivot; - actor.SetAnchorPoint( anchorPoint ); + actor.SetProperty( Actor::Property::ANCHOR_POINT, anchorPoint ); actor.SetSize( Vector3( meshInfo.size.x, meshInfo.size.y, meshInfo.size.z ) ); actor.AddRenderer( renderer ); @@ -1648,7 +1648,7 @@ Actor Loader::AddNode( Scene3dView& scene3dView, uint32_t index ) } else { - actor.SetAnchorPoint( AnchorPoint::CENTER ); + actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); actor.SetPosition( translation ); actor.RotateBy( orientation ); actor.SetSize( actorSize ); @@ -1670,7 +1670,7 @@ Actor Loader::AddNode( Scene3dView& scene3dView, uint32_t index ) { std::string nameString; ReadString( tempNode, nameString ); - actor.SetName( nameString ); + actor.SetProperty( Dali::Actor::Property::NAME, nameString ); } SetActorCache( actor, index ); @@ -1679,7 +1679,7 @@ Actor Loader::AddNode( Scene3dView& scene3dView, uint32_t index ) for( auto childIter = tempNode->CBegin(), end = tempNode->CEnd(); childIter != end; ++childIter ) { Actor childActor = AddNode( scene3dView, ( ( *childIter ).second ).GetInteger() ); - childActor.SetParentOrigin( anchorPoint ); + childActor.SetProperty( Actor::Property::PARENT_ORIGIN, anchorPoint ); actor.Add( childActor ); } } diff --git a/dali-toolkit/internal/controls/scene3d-view/scene3d-view-impl.cpp b/dali-toolkit/internal/controls/scene3d-view/scene3d-view-impl.cpp index 990aedf..0a9574c 100644 --- a/dali-toolkit/internal/controls/scene3d-view/scene3d-view-impl.cpp +++ b/dali-toolkit/internal/controls/scene3d-view/scene3d-view-impl.cpp @@ -246,8 +246,8 @@ void Scene3dView::SetCubeMap( const std::string& diffuseTexturePath, const std:: bool Scene3dView::SetDefaultCamera( const Dali::Camera::Type type, const float nearPlane, const Vector3 cameraPosition ) { - mDefaultCamera.SetParentOrigin( ParentOrigin::CENTER ); - mDefaultCamera.SetAnchorPoint( AnchorPoint::CENTER ); + mDefaultCamera.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mDefaultCamera.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); mDefaultCamera.SetType( type ); mDefaultCamera.SetNearClippingPlane( nearPlane ); mDefaultCamera.SetPosition( cameraPosition ); @@ -352,19 +352,19 @@ Texture Scene3dView::LoadTexture( const char *imageUrl, bool generateMipmaps ) void Scene3dView::OnInitialize() { - mRoot.SetParentOrigin( ParentOrigin::CENTER ); - mRoot.SetAnchorPoint( AnchorPoint::CENTER ); + mRoot.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mRoot.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); Layer layer = Layer::New(); layer.SetBehavior( Layer::LAYER_3D ); - layer.SetParentOrigin( ParentOrigin::CENTER ); - layer.SetAnchorPoint( AnchorPoint::CENTER ); + layer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + layer.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); layer.Add( mRoot ); Actor self = Self(); // Apply some default resizing rules. - self.SetParentOrigin( ParentOrigin::CENTER ); - self.SetAnchorPoint( AnchorPoint::CENTER ); + self.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + self.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); self.Add( layer ); CreateScene(); diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp index 6b842fe..2227242 100755 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp @@ -28,6 +28,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -243,8 +244,8 @@ void ScrollBar::CreateDefaultIndicatorActor() { const std::string imageDirPath = AssetManager::GetDaliImagePath(); Toolkit::ImageView indicator = Toolkit::ImageView::New( imageDirPath + DEFAULT_INDICATOR_IMAGE_FILE_NAME ); - indicator.SetParentOrigin( ParentOrigin::TOP_LEFT ); - indicator.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + indicator.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + indicator.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); indicator.SetStyleName( "ScrollBarIndicator" ); indicator.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR ); SetScrollIndicator(indicator); @@ -306,7 +307,7 @@ void ScrollBar::ApplyConstraints() // Set indicator height according to the indicator's height policy if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed) { - mIndicator.SetSize(Self().GetCurrentSize().width, mIndicatorFixedHeight); + mIndicator.SetSize(Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, mIndicatorFixedHeight); } else { @@ -378,7 +379,7 @@ void ScrollBar::ShowIndicator() if( mIndicatorFirstShow ) { // Preserve the alpha value from the stylesheet - mIndicatorShowAlpha = Self().GetCurrentColor().a; + mIndicatorShowAlpha = Self().GetCurrentProperty< Vector4 >( Actor::Property::COLOR ).a; mIndicatorFirstShow = false; } @@ -390,7 +391,7 @@ void ScrollBar::ShowIndicator() } else { - mIndicator.SetOpacity(mIndicatorShowAlpha); + mIndicator.SetProperty( DevelActor::Property::OPACITY,mIndicatorShowAlpha); } } @@ -411,7 +412,7 @@ void ScrollBar::HideIndicator() } else { - mIndicator.SetOpacity(0.0f); + mIndicator.SetProperty( DevelActor::Property::OPACITY,0.0f); } } @@ -432,7 +433,7 @@ void ScrollBar::ShowTransientIndicator() } else { - mIndicator.SetOpacity(mIndicatorShowAlpha); + mIndicator.SetProperty( DevelActor::Property::OPACITY,mIndicatorShowAlpha); } mAnimation.AnimateTo( Property( mIndicator, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunction::EASE_IN, TimePeriod((mIndicatorShowDuration + mTransientIndicatorDuration), mIndicatorHideDuration) ); @@ -488,7 +489,7 @@ void ScrollBar::OnPan( const PanGesture& gesture ) // The domain size is the internal range float domainSize = maxScrollPosition - minScrollPosition; - float logicalSize = Self().GetCurrentSize().y - ( mIndicator.GetCurrentSize().y + mIndicatorStartPadding + mIndicatorEndPadding ); + float logicalSize = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y - ( mIndicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y + mIndicatorStartPadding + mIndicatorEndPadding ); mCurrentScrollPosition = mScrollStart - ( ( mGestureDisplacement.y * domainSize ) / logicalSize ); mCurrentScrollPosition = -std::min( maxScrollPosition, std::max( -mCurrentScrollPosition, minScrollPosition ) ); @@ -567,7 +568,7 @@ void ScrollBar::SetIndicatorFixedHeight( float height ) if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed) { - mIndicator.SetSize(Self().GetCurrentSize().width, mIndicatorFixedHeight); + mIndicator.SetSize(Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, mIndicatorFixedHeight); } } diff --git a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h index 1eb7725..f78ab9f 100644 --- a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h +++ b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h @@ -42,10 +42,10 @@ namespace Internal * // set size and color * bounceActor.SetSize(720.f, 42.f ); - * bounceActor.SetColor( Vector4( 0.0,0.64f,0.85f,0.25f ) ); + * bounceActor.SetProperty( Actor::Property::COLOR, Vector4( 0.0,0.64f,0.85f,0.25f ) ); * * // add to stage - * bounceActor.SetParentOrigin(ParentOrigin::CENTER); + * bounceActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); * Stage::GetCurrent().Add(bounceActor); * // start the bouncing animation diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp index b5fbc4d..43aa9a3 100755 --- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp @@ -543,7 +543,7 @@ void ItemView::DoRefresh(float currentLayoutPosition, bool cacheExtra) { ItemRange range = GetItemRange(*mActiveLayout, mActiveLayoutTargetSize, currentLayoutPosition, cacheExtra/*reserve extra*/); RemoveActorsOutsideRange( range ); - AddActorsWithinRange( range, Self().GetCurrentSize() ); + AddActorsWithinRange( range, Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ) ); mScrollUpdatedSignal.Emit( Vector2(0.0f, currentLayoutPosition) ); } @@ -660,7 +660,7 @@ unsigned int ItemView::GetItemId( Actor actor ) const void ItemView::InsertItem( Item newItem, float durationSeconds ) { mAddingItems = true; - Vector3 layoutSize = Self().GetCurrentSize(); + Vector3 layoutSize = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); Actor displacedActor; ItemIter afterDisplacedIter = mItemPool.end(); @@ -724,7 +724,7 @@ void ItemView::InsertItem( Item newItem, float durationSeconds ) void ItemView::InsertItems( const ItemContainer& newItems, float durationSeconds ) { mAddingItems = true; - Vector3 layoutSize = Self().GetCurrentSize(); + Vector3 layoutSize = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); // Insert from lowest id to highest ItemContainer sortedItems(newItems); @@ -867,7 +867,7 @@ bool ItemView::RemoveActor(unsigned int itemId) void ItemView::ReplaceItem( Item replacementItem, float durationSeconds ) { mAddingItems = true; - Vector3 layoutSize = Self().GetCurrentSize(); + Vector3 layoutSize = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); SetupActor( replacementItem, layoutSize ); Self().Add( replacementItem.second ); @@ -938,7 +938,7 @@ void ItemView::AddActorsWithinRange( ItemRange range, const Vector3& layoutSize // Total number of items may change dynamically. // Always recalculate the domain size to reflect that. - CalculateDomainSize(Self().GetCurrentSize()); + CalculateDomainSize(Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE )); } void ItemView::AddNewActor( unsigned int itemId, const Vector3& layoutSize ) @@ -965,8 +965,8 @@ void ItemView::AddNewActor( unsigned int itemId, const Vector3& layoutSize ) void ItemView::SetupActor( Item item, const Vector3& layoutSize ) { - item.second.SetParentOrigin( mItemsParentOrigin ); - item.second.SetAnchorPoint( mItemsAnchorPoint ); + item.second.SetProperty( Actor::Property::PARENT_ORIGIN, mItemsParentOrigin ); + item.second.SetProperty( Actor::Property::ANCHOR_POINT, mItemsAnchorPoint ); if( mActiveLayout ) { @@ -1028,7 +1028,7 @@ bool ItemView::OnWheelEvent(const WheelEvent& event) if (mActiveLayout) { Actor self = Self(); - const Vector3 layoutSize = Self().GetCurrentSize(); + const Vector3 layoutSize = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); float layoutPositionDelta = GetCurrentLayoutPosition(0) - (event.z * mWheelScrollDistanceStep * mActiveLayout->GetScrollSpeedFactor()); float firstItemScrollPosition = ClampFirstItemPosition(layoutPositionDelta, layoutSize, *mActiveLayout); @@ -1075,7 +1075,7 @@ bool ItemView::OnWheelEventFinished() void ItemView::ReapplyAllConstraints() { - Vector3 layoutSize = Self().GetCurrentSize(); + Vector3 layoutSize = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); for (ConstItemIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) { @@ -1089,12 +1089,12 @@ void ItemView::ReapplyAllConstraints() void ItemView::OnItemsRemoved() { - CalculateDomainSize(Self().GetCurrentSize()); + CalculateDomainSize(Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE )); // Adjust scroll-position after an item is removed if( mActiveLayout ) { - float firstItemScrollPosition = ClampFirstItemPosition(GetCurrentLayoutPosition(0), Self().GetCurrentSize(), *mActiveLayout); + float firstItemScrollPosition = ClampFirstItemPosition(GetCurrentLayoutPosition(0), Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), *mActiveLayout); Self().SetProperty( Toolkit::ItemView::Property::LAYOUT_POSITION, firstItemScrollPosition ); } } @@ -1148,7 +1148,7 @@ bool ItemView::OnTouch( Actor actor, const TouchData& touch ) void ItemView::OnPan( const PanGesture& gesture ) { Actor self = Self(); - const Vector3 layoutSize = Self().GetCurrentSize(); + const Vector3 layoutSize = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); RemoveAnimation(mScrollAnimation); @@ -1323,7 +1323,7 @@ Actor ItemView::GetNextKeyboardFocusableActor(Actor actor, Toolkit::Control::Key } } float layoutPosition = mActiveLayout->GetClosestAnchorPosition( GetCurrentLayoutPosition(0) ); - Vector3 layoutSize = Self().GetCurrentSize(); + Vector3 layoutSize = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); if(!nextFocusActor) { // likely the current item is not buffered, so not in our item pool, probably best to get first viewable item @@ -1342,7 +1342,7 @@ void ItemView::OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor) { int nextItemID = GetItemId(commitedFocusableActor); float layoutPosition = GetCurrentLayoutPosition(0); - Vector3 layoutSize = Self().GetCurrentSize(); + Vector3 layoutSize = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); float scrollTo = mActiveLayout->GetClosestOnScreenLayoutPosition(nextItemID, layoutPosition, layoutSize); ScrollTo(Vector2(0.0f, scrollTo), DEFAULT_KEYBOARD_FOCUS_SCROLL_DURATION); @@ -1417,7 +1417,7 @@ void ItemView::OnOvershootOnFinished(Animation& animation) void ItemView::ScrollToItem(unsigned int itemId, float durationSeconds) { Actor self = Self(); - const Vector3 layoutSize = Self().GetCurrentSize(); + const Vector3 layoutSize = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); float firstItemScrollPosition = ClampFirstItemPosition(mActiveLayout->GetItemScrollToPosition(itemId), layoutSize, *mActiveLayout); if(durationSeconds > 0.0f) @@ -1503,7 +1503,7 @@ float ItemView::GetScrollPosition(float layoutPosition, const Vector3& layoutSiz Vector2 ItemView::GetCurrentScrollPosition() const { - return Vector2(0.0f, GetScrollPosition(GetCurrentLayoutPosition(0), Self().GetCurrentSize())); + return Vector2(0.0f, GetScrollPosition(GetCurrentLayoutPosition(0), Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ))); } void ItemView::AddOverlay(Actor actor) @@ -1520,7 +1520,7 @@ void ItemView::RemoveOverlay(Actor actor) void ItemView::ScrollTo(const Vector2& position, float duration) { Actor self = Self(); - const Vector3 layoutSize = Self().GetCurrentSize(); + const Vector3 layoutSize = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); float firstItemScrollPosition = ClampFirstItemPosition(position.y, layoutSize, *mActiveLayout); @@ -1559,7 +1559,7 @@ void ItemView::SetOvershootEffectColor( const Vector4& color ) mOvershootEffectColor = color; if( mOvershootOverlay ) { - mOvershootOverlay.SetColor( color ); + mOvershootOverlay.SetProperty( Actor::Property::COLOR, color ); } } @@ -1572,9 +1572,9 @@ void ItemView::EnableScrollOvershoot( bool enable ) { Property::Index effectOvershootPropertyIndex = Property::INVALID_INDEX; mOvershootOverlay = CreateBouncingEffectActor( effectOvershootPropertyIndex ); - mOvershootOverlay.SetColor(mOvershootEffectColor); - mOvershootOverlay.SetParentOrigin(ParentOrigin::TOP_LEFT); - mOvershootOverlay.SetAnchorPoint(AnchorPoint::TOP_LEFT); + mOvershootOverlay.SetProperty( Actor::Property::COLOR,mOvershootEffectColor); + mOvershootOverlay.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT ); + mOvershootOverlay.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); mOvershootOverlay.SetDrawMode( DrawMode::OVERLAY_2D ); self.Add(mOvershootOverlay); @@ -1623,7 +1623,7 @@ float ItemView::CalculateScrollOvershoot() Actor self = Self(); float scrollDistance = CalculateScrollDistance(mTotalPanDisplacement, *mActiveLayout) * mActiveLayout->GetScrollSpeedFactor(); float positionDelta = GetCurrentLayoutPosition(0) + scrollDistance; - float minLayoutPosition = mActiveLayout->GetMinimumLayoutPosition(mItemFactory.GetNumberOfItems(), Self().GetCurrentSize()); + float minLayoutPosition = mActiveLayout->GetMinimumLayoutPosition(mItemFactory.GetNumberOfItems(), Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE )); self.SetProperty(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX, Vector2(0.0f, -minLayoutPosition)); float clamppedPosition = std::min(0.0f, std::max(minLayoutPosition, positionDelta)); overshoot = positionDelta - clamppedPosition; @@ -1654,7 +1654,7 @@ void ItemView::AnimateScrollOvershoot(float overshootAmount, bool animateBack) if (mOvershootOverlay) { - duration = mOvershootOverlay.GetCurrentSize().height * (animatingOn ? (1.0f - fabsf(currentOvershoot)) : fabsf(currentOvershoot)) / mOvershootAnimationSpeed; + duration = mOvershootOverlay.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height * (animatingOn ? (1.0f - fabsf(currentOvershoot)) : fabsf(currentOvershoot)) / mOvershootAnimationSpeed; } // Mark the animation as in progress to prevent manual property sets overwriting it. @@ -1679,7 +1679,7 @@ void ItemView::SetItemsParentOrigin( const Vector3& parentOrigin ) mItemsParentOrigin = parentOrigin; for (ItemIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) { - iter->second.SetParentOrigin(parentOrigin); + iter->second.SetProperty( Actor::Property::PARENT_ORIGIN,parentOrigin ); } } } @@ -1696,7 +1696,7 @@ void ItemView::SetItemsAnchorPoint( const Vector3& anchorPoint ) mItemsAnchorPoint = anchorPoint; for (ItemIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) { - iter->second.SetAnchorPoint(anchorPoint); + iter->second.SetProperty( Actor::Property::ANCHOR_POINT,anchorPoint); } } } diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp index 859805c..ee80f49 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp @@ -133,10 +133,10 @@ ScrollOvershootEffectRipple::ScrollOvershootEffectRipple( bool vertical, Scrolla mAnimationStateFlags(0) { mOvershootOverlay = CreateBouncingEffectActor(mEffectOvershootProperty); - mOvershootOverlay.SetColor(mAttachedScrollView.GetOvershootEffectColor()); - mOvershootOverlay.SetParentOrigin(ParentOrigin::TOP_LEFT); - mOvershootOverlay.SetAnchorPoint(AnchorPoint::TOP_LEFT); - mOvershootOverlay.SetVisible(false); + mOvershootOverlay.SetProperty( Actor::Property::COLOR,mAttachedScrollView.GetOvershootEffectColor()); + mOvershootOverlay.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT ); + mOvershootOverlay.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + mOvershootOverlay.SetProperty( Actor::Property::VISIBLE,false); } @@ -174,7 +174,7 @@ void ScrollOvershootEffectRipple::Remove( Scrollable& scrollable ) void ScrollOvershootEffectRipple::Reset() { - mOvershootOverlay.SetVisible(false); + mOvershootOverlay.SetProperty( Actor::Property::VISIBLE,false); mOvershootOverlay.SetProperty( mEffectOvershootProperty, 0.f); } @@ -224,13 +224,13 @@ void ScrollOvershootEffectRipple::SetOvershootEffectColor( const Vector4& color { if(mOvershootOverlay) { - mOvershootOverlay.SetColor(color); + mOvershootOverlay.SetProperty( Actor::Property::COLOR,color); } } void ScrollOvershootEffectRipple::UpdateVisibility( bool visible ) { - mOvershootOverlay.SetVisible(visible); + mOvershootOverlay.SetProperty( Actor::Property::VISIBLE,visible); // make sure overshoot image is correctly placed if( visible ) { @@ -238,9 +238,9 @@ void ScrollOvershootEffectRipple::UpdateVisibility( bool visible ) if(mOvershoot > 0.0f) { // positive overshoot - const Vector3 size = mOvershootOverlay.GetCurrentSize(); + const Vector3 size = mOvershootOverlay.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); Vector3 relativeOffset; - const Vector3 parentSize = self.GetCurrentSize(); + const Vector3 parentSize = self.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); if(IsVertical()) { mOvershootOverlay.SetOrientation( Quaternion( Radian( 0.0f ), Vector3::ZAXIS ) ); @@ -257,9 +257,9 @@ void ScrollOvershootEffectRipple::UpdateVisibility( bool visible ) else { // negative overshoot - const Vector3 size = mOvershootOverlay.GetCurrentSize(); + const Vector3 size = mOvershootOverlay.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); Vector3 relativeOffset; - const Vector3 parentSize = self.GetCurrentSize(); + const Vector3 parentSize = self.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); if(IsVertical()) { mOvershootOverlay.SetOrientation( Quaternion( Radian( Math::PI ), Vector3::ZAXIS ) ); @@ -320,7 +320,7 @@ void ScrollOvershootEffectRipple::SetOvershoot(float amount, bool animate) if( animate && overshootAnimationSpeed > Math::MACHINE_EPSILON_0 ) { float currentOvershoot = fabsf( mOvershootOverlay.GetProperty( mEffectOvershootProperty ).Get() ); - float duration = mOvershootOverlay.GetCurrentSize().height * (animatingOn ? (1.0f - currentOvershoot) : currentOvershoot) / overshootAnimationSpeed; + float duration = mOvershootOverlay.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height * (animatingOn ? (1.0f - currentOvershoot) : currentOvershoot) / overshootAnimationSpeed; if( duration > Math::MACHINE_EPSILON_0 ) { @@ -349,7 +349,7 @@ void ScrollOvershootEffectRipple::OnOvershootAnimFinished(Animation& animation) if( mAnimationStateFlags & AnimatingOut ) { // should now be offscreen - mOvershootOverlay.SetVisible(false); + mOvershootOverlay.SetProperty( Actor::Property::VISIBLE,false); } if( (mAnimationStateFlags & AnimateBack) ) { diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp index e395194..0053778 100755 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp @@ -145,9 +145,9 @@ float VectorInDomain(float a, float b, float start, float end, Dali::Toolkit::Di */ Vector3 GetPositionOfAnchor(Actor &actor, const Vector3 &anchor) { - Vector3 childPosition = actor.GetCurrentPosition(); - Vector3 childAnchor = - actor.GetCurrentAnchorPoint() + anchor; - Vector3 childSize = actor.GetCurrentSize(); + Vector3 childPosition = actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); + Vector3 childAnchor = - actor.GetCurrentProperty< Vector3 >( Actor::Property::ANCHOR_POINT ) + anchor; + Vector3 childSize = actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); return childPosition + childAnchor * childSize; } @@ -676,8 +676,8 @@ void ScrollView::OnInitialize() mInternalActor = Actor::New(); self.Add(mInternalActor); - mInternalActor.SetParentOrigin(ParentOrigin::CENTER); - mInternalActor.SetAnchorPoint(AnchorPoint::CENTER); + mInternalActor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); + mInternalActor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); mInternalActor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mAlterChild = true; @@ -1321,8 +1321,8 @@ void ScrollView::ScrollTo(Actor &actor, float duration) DALI_ASSERT_ALWAYS(actor.GetParent() == Self()); Actor self = Self(); - Vector3 size = self.GetCurrentSize(); - Vector3 position = actor.GetCurrentPosition(); + Vector3 size = self.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); + Vector3 position = actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); Vector2 prePosition = GetPropertyPrePosition(); position.GetVectorXY() -= prePosition; @@ -1332,7 +1332,7 @@ void ScrollView::ScrollTo(Actor &actor, float duration) Actor ScrollView::FindClosestActor() { Actor self = Self(); - Vector3 size = self.GetCurrentSize(); + Vector3 size = self.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); return FindClosestActorToPosition(Vector3(size.width * 0.5f,size.height * 0.5f,0.0f)); } @@ -1524,7 +1524,7 @@ bool ScrollView::SnapWithVelocity(Vector2 velocity) if(mActorAutoSnapEnabled) { - Vector3 size = Self().GetCurrentSize(); + Vector3 size = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); Actor child = FindClosestActorToPosition( Vector3(size.width * 0.5f,size.height * 0.5f,0.0f), horizontal, vertical ); @@ -1968,7 +1968,7 @@ void ScrollView::OnChildAdd(Actor& child) if( scrollBar ) { mScrollBar = scrollBar; - scrollBar.SetName("ScrollBar"); + scrollBar.SetProperty( Dali::Actor::Property::NAME,"ScrollBar"); mInternalActor.Add( scrollBar ); if( scrollBar.GetScrollDirection() == Toolkit::ScrollBar::Horizontal ) @@ -2494,7 +2494,7 @@ void ScrollView::OnPan( const PanGesture& gesture ) Toolkit::ScrollBar scrollBar = mScrollBar.GetHandle(); if( scrollBar && mTransientScrollBar ) { - Vector3 size = Self().GetCurrentSize(); + Vector3 size = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); const Toolkit::RulerDomain& rulerDomainX = mRulerX->GetDomain(); const Toolkit::RulerDomain& rulerDomainY = mRulerY->GetDomain(); @@ -2635,7 +2635,7 @@ void ScrollView::FinishTransform() Vector2 ScrollView::GetOvershoot(Vector2& position) const { - Vector3 size = Self().GetCurrentSize(); + Vector3 size = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); Vector2 overshoot; const RulerDomain rulerDomainX = mRulerX->GetDomain(); @@ -2690,7 +2690,7 @@ void ScrollView::ClampPosition(Vector2& position) const void ScrollView::ClampPosition(Vector2& position, ClampState2D &clamped) const { - Vector3 size = Self().GetCurrentSize(); + Vector3 size = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); position.x = -mRulerX->Clamp(-position.x, size.width, 1.0f, clamped.x); // NOTE: X & Y rulers think in -ve coordinate system. position.y = -mRulerY->Clamp(-position.y, size.height, 1.0f, clamped.y); // That is scrolling RIGHT (e.g. 100.0, 0.0) means moving LEFT. diff --git a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp index 0233991..2830165 100644 --- a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp +++ b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp @@ -155,9 +155,9 @@ void ShadowView::SetShadowPlaneBackground(Actor shadowPlaneBackground) mShadowPlaneBg = shadowPlaneBackground; mShadowPlane = Actor::New(); - mShadowPlane.SetName( "SHADOW_PLANE" ); - mShadowPlane.SetParentOrigin( ParentOrigin::CENTER ); - mShadowPlane.SetAnchorPoint( AnchorPoint::CENTER ); + mShadowPlane.SetProperty( Actor::Property::NAME, "SHADOW_PLANE" ); + mShadowPlane.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mShadowPlane.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); Renderer shadowRenderer = CreateRenderer( RENDER_SHADOW_VERTEX_SOURCE, RENDER_SHADOW_FRAGMENT_SOURCE, Shader::Hint::OUTPUT_IS_TRANSPARENT, Uint16Pair(20,20) ); TextureSet textureSet = shadowRenderer.GetTextures(); textureSet.SetTexture( 0u, mOutputFrameBuffer.GetColorTexture() ); @@ -168,7 +168,7 @@ void ShadowView::SetShadowPlaneBackground(Actor shadowPlaneBackground) // Rather than parent the shadow plane drawable and have constraints to move it to the same // position, instead parent the shadow plane drawable on the shadow plane passed in. mShadowPlaneBg.Add( mShadowPlane ); - mShadowPlane.SetParentOrigin( ParentOrigin::CENTER ); + mShadowPlane.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mShadowPlane.SetZ( 1.0f ); ConstrainCamera(); @@ -232,13 +232,13 @@ void ShadowView::Deactivate() void ShadowView::OnInitialize() { // root actor to parent all user added actors. Used as source actor for shadow render task. - mChildrenRoot.SetParentOrigin( ParentOrigin::CENTER ); + mChildrenRoot.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mChildrenRoot.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); Vector2 stageSize = Stage::GetCurrent().GetSize(); mCameraActor = CameraActor::New(stageSize); - mCameraActor.SetParentOrigin( ParentOrigin::CENTER ); + mCameraActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); // Target is constrained to point at the shadow plane origin mCameraActor.SetNearClippingPlane( 1.0f ); @@ -268,13 +268,13 @@ void ShadowView::OnInitialize() mBlurFilter.SetPixelFormat( Pixel::RGBA8888 ); mBlurRootActor = Actor::New(); - mBlurRootActor.SetName( "BLUR_ROOT_ACTOR" ); + mBlurRootActor.SetProperty( Actor::Property::NAME, "BLUR_ROOT_ACTOR" ); // Turn off inheritance to ensure filter renders properly - mBlurRootActor.SetParentOrigin( ParentOrigin::CENTER ); - mBlurRootActor.SetInheritPosition( false ); - mBlurRootActor.SetInheritOrientation( false ); - mBlurRootActor.SetInheritScale( false ); + mBlurRootActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mBlurRootActor.SetProperty( Actor::Property::INHERIT_POSITION, false ); + mBlurRootActor.SetProperty( Actor::Property::INHERIT_ORIENTATION, false ); + mBlurRootActor.SetProperty( Actor::Property::INHERIT_SCALE, false ); mBlurRootActor.SetColorMode( USE_OWN_COLOR ); Self().Add( mBlurRootActor ); diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp index 419d222..4fa4bf6 100755 --- a/dali-toolkit/internal/controls/slider/slider-impl.cpp +++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp @@ -379,8 +379,8 @@ bool Slider::GetSnapToMarks() const Actor Slider::CreateHitRegion() { Actor hitRegion = Actor::New(); - hitRegion.SetParentOrigin( ParentOrigin::CENTER ); - hitRegion.SetAnchorPoint( AnchorPoint::CENTER ); + hitRegion.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + hitRegion.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); hitRegion.TouchSignal().Connect( this, &Slider::OnTouch ); return hitRegion; @@ -389,9 +389,9 @@ Actor Slider::CreateHitRegion() Toolkit::ImageView Slider::CreateTrack() { Toolkit::ImageView track = Toolkit::ImageView::New(); - track.SetName("SliderTrack"); - track.SetParentOrigin( ParentOrigin::CENTER ); - track.SetAnchorPoint( AnchorPoint::CENTER ); + track.SetProperty( Dali::Actor::Property::NAME,"SliderTrack"); + track.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + track.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); return track; } @@ -451,9 +451,9 @@ std::string Slider::GetTrackVisual() Toolkit::ImageView Slider::CreateProgress() { Toolkit::ImageView progress = Toolkit::ImageView::New(); - progress.SetName("SliderProgress"); - progress.SetParentOrigin( ParentOrigin::CENTER_LEFT ); - progress.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); + progress.SetProperty( Dali::Actor::Property::NAME,"SliderProgress"); + progress.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_LEFT ); + progress.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER_LEFT ); return progress; } @@ -577,9 +577,9 @@ void Slider::ResizeProgressRegion( const Vector2& region ) Toolkit::ImageView Slider::CreateHandle() { Toolkit::ImageView handle = Toolkit::ImageView::New(); - handle.SetName("SliderHandle"); - handle.SetParentOrigin( ParentOrigin::CENTER_LEFT ); - handle.SetAnchorPoint( AnchorPoint::CENTER ); + handle.SetProperty( Dali::Actor::Property::NAME,"SliderHandle"); + handle.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_LEFT ); + handle.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); return handle; } @@ -588,9 +588,9 @@ Toolkit::ImageView Slider::CreatePopupArrow() { Toolkit::ImageView arrow = Toolkit::ImageView::New(); arrow.SetStyleName("SliderPopupArrow"); - arrow.SetName("SliderPopupArrow"); - arrow.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); - arrow.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); + arrow.SetProperty( Dali::Actor::Property::NAME,"SliderPopupArrow"); + arrow.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER ); + arrow.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); return arrow; } @@ -598,10 +598,10 @@ Toolkit::ImageView Slider::CreatePopupArrow() Toolkit::TextLabel Slider::CreatePopupText() { Toolkit::TextLabel textLabel = Toolkit::TextLabel::New(); - textLabel.SetName( "SliderPopupTextLabel" ); + textLabel.SetProperty( Dali::Actor::Property::NAME, "SliderPopupTextLabel" ); textLabel.SetStyleName( "SliderPopupTextLabel" ); - textLabel.SetParentOrigin( ParentOrigin::CENTER ); - textLabel.SetAnchorPoint( AnchorPoint::CENTER ); + textLabel.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + textLabel.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); @@ -612,9 +612,9 @@ Toolkit::TextLabel Slider::CreatePopupText() Toolkit::ImageView Slider::CreatePopup() { Toolkit::ImageView popup = Toolkit::ImageView::New(); - popup.SetName( "SliderPopup" ); - popup.SetParentOrigin( ParentOrigin::TOP_CENTER ); - popup.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); + popup.SetProperty( Dali::Actor::Property::NAME, "SliderPopup" ); + popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER ); + popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); popup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::WIDTH ); mValueTextLabel = CreatePopupText(); @@ -683,10 +683,10 @@ void Slider::CreateHandleValueDisplay() if( mHandle && !mHandleValueTextLabel ) { mHandleValueTextLabel = Toolkit::TextLabel::New(); - mHandleValueTextLabel.SetName("SliderHandleTextLabel"); + mHandleValueTextLabel.SetProperty( Dali::Actor::Property::NAME,"SliderHandleTextLabel"); mHandleValueTextLabel.SetStyleName("SliderHandleTextLabel"); - mHandleValueTextLabel.SetParentOrigin( ParentOrigin::CENTER ); - mHandleValueTextLabel.SetAnchorPoint( AnchorPoint::CENTER ); + mHandleValueTextLabel.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mHandleValueTextLabel.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); mHandleValueTextLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); mHandleValueTextLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); mHandle.Add( mHandleValueTextLabel ); @@ -701,8 +701,8 @@ void Slider::DestroyHandleValueDisplay() Actor Slider::CreateValueDisplay() { Actor popup = Actor::New(); - popup.SetParentOrigin( ParentOrigin::TOP_CENTER ); - popup.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); + popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER ); + popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); mPopupArrow = CreatePopupArrow(); popup.Add( mPopupArrow ); @@ -735,17 +735,17 @@ void Slider::UpdateSkin() { case NORMAL: { - mTrack.SetColor( Color::WHITE ); - mHandle.SetColor( Color::WHITE ); - mProgress.SetColor( Color::WHITE ); + mTrack.SetProperty( Actor::Property::COLOR, Color::WHITE ); + mHandle.SetProperty( Actor::Property::COLOR, Color::WHITE ); + mProgress.SetProperty( Actor::Property::COLOR, Color::WHITE ); break; } case DISABLED: { Vector4 disabledColor = GetDisabledColor(); - mTrack.SetColor( disabledColor ); - mHandle.SetColor( disabledColor ); - mProgress.SetColor( disabledColor ); + mTrack.SetProperty( Actor::Property::COLOR, disabledColor ); + mHandle.SetProperty( Actor::Property::COLOR, disabledColor ); + mProgress.SetProperty( Actor::Property::COLOR, disabledColor ); break; } case PRESSED: @@ -803,7 +803,7 @@ void Slider::AddPopup() if( !mValueDisplay ) { mValueDisplay = CreateValueDisplay(); - mValueDisplay.SetVisible( false ); + mValueDisplay.SetProperty( Actor::Property::VISIBLE, false ); mHandle.Add( mValueDisplay ); CreatePopupImage( GetPopupVisual() ); @@ -918,7 +918,7 @@ bool Slider::HideValueView() { if( mValueDisplay ) { - mValueDisplay.SetVisible( false ); + mValueDisplay.SetProperty( Actor::Property::VISIBLE, false ); } return false; @@ -1121,7 +1121,7 @@ void Slider::DisplayPopup( float value ) if( mValueDisplay ) { - mValueDisplay.SetVisible( true ); + mValueDisplay.SetProperty( Actor::Property::VISIBLE, true ); mValueTimer.SetInterval( VALUE_VIEW_SHOW_DURATION ); } diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp index 70bd49d..1d6072c 100644 --- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp +++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp @@ -232,7 +232,7 @@ void SuperBlurView::BlurTexture( unsigned int idx, Texture texture ) GAUSSIAN_BLUR_BELL_CURVE_WIDTH + GAUSSIAN_BLUR_BELL_CURVE_WIDTH_INCREMENTATION*static_cast(idx), GAUSSIAN_BLUR_RENDER_TARGET_PIXEL_FORMAT, GAUSSIAN_BLUR_DOWNSAMPLE_WIDTH_SCALE, GAUSSIAN_BLUR_DOWNSAMPLE_HEIGHT_SCALE, true ); - mGaussianBlurView[idx].SetParentOrigin(ParentOrigin::CENTER); + mGaussianBlurView[idx].SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); mGaussianBlurView[idx].SetSize(mTargetSize); Stage::GetCurrent().Add( mGaussianBlurView[idx] ); diff --git a/dali-toolkit/internal/controls/table-view/table-view-impl.cpp b/dali-toolkit/internal/controls/table-view/table-view-impl.cpp index b4e81c7..9a85dce 100755 --- a/dali-toolkit/internal/controls/table-view/table-view-impl.cpp +++ b/dali-toolkit/internal/controls/table-view/table-view-impl.cpp @@ -66,7 +66,7 @@ void PrintArray( Array2d& array ) if( data.actor ) { actor = 'A'; - actorName = data.actor.GetName(); + actorName = data.actor.GetProperty< std::string >( Dali::Actor::Property::NAME ); } TV_LOG("Array[%d,%d]=%c %s %d,%d,%d,%d ", i, j, actor, actorName.c_str(), data.position.rowIndex, data.position.columnIndex, @@ -831,9 +831,9 @@ void TableView::OnRelayout( const Vector2& size, RelayoutContainer& container ) // Anchor actor to top left of the cell if( actor.GetProperty( DevelActor::Property::POSITION_USES_ANCHOR_POINT ).Get< bool >() ) { - actor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); } - actor.SetParentOrigin( ParentOrigin::TOP_LEFT ); + actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); Padding padding; actor.GetPadding( padding ); diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp index 3444c39..9384ec8 100755 --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp @@ -1279,8 +1279,8 @@ void TextEditor::OnInitialize() // Creates an extra control to be used as stencil buffer. mStencil = Control::New(); - mStencil.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - mStencil.SetParentOrigin( ParentOrigin::TOP_LEFT ); + mStencil.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + mStencil.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); // Creates a background visual. Even if the color is transparent it updates the stencil. mStencil.SetProperty( Toolkit::Control::Property::BACKGROUND, @@ -1646,8 +1646,8 @@ void TextEditor::AddDecoration( Actor& actor, bool needsClipping ) } else { - actor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - actor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Self().Add( actor ); mActiveLayer = actor; } @@ -1678,8 +1678,8 @@ void TextEditor::UpdateScrollBar() { mScrollBar = Toolkit::ScrollBar::New( Toolkit::ScrollBar::Vertical ); mScrollBar.SetIndicatorHeightPolicy( Toolkit::ScrollBar::Variable ); - mScrollBar.SetParentOrigin( ParentOrigin::TOP_RIGHT ); - mScrollBar.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); + mScrollBar.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_RIGHT ); + mScrollBar.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT ); mScrollBar.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); mScrollBar.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::WIDTH ); @@ -1733,7 +1733,7 @@ void TextEditor::UpdateScrollBar() { mAnimation = Animation::New( mAnimationPeriod.durationSeconds ); } - indicator.SetOpacity(1.0f); + indicator.SetProperty( DevelActor::Property::OPACITY,1.0f); mAnimation.AnimateTo( Property( indicator, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunction::EASE_IN, mAnimationPeriod ); mAnimation.Play(); mAnimation.FinishedSignal().Connect( this, &TextEditor::OnScrollIndicatorAnimationFinished ); diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp index f9b4b70..2b4fcc0 100755 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -1555,7 +1555,7 @@ void TextField::RenderText( Text::Controller::UpdateTextType updateTextType ) self.Add( *it ); it->LowerToBottom(); - if ( it->GetName() == "HighlightActor" ) + if ( it->GetProperty< std::string >( Dali::Actor::Property::NAME ) == "HighlightActor" ) { highlightActor = *it; } @@ -1770,8 +1770,8 @@ void TextField::AddDecoration( Actor& actor, bool needsClipping ) } else { - actor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - actor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Self().Add( actor ); mActiveLayer = actor; } @@ -1817,8 +1817,8 @@ void TextField::EnableClipping() { // Creates an extra control to be used as stencil buffer. mStencil = Control::New(); - mStencil.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - mStencil.SetParentOrigin( ParentOrigin::TOP_LEFT ); + mStencil.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + mStencil.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); // Creates a background visual. Even if the color is transparent it updates the stencil. mStencil.SetProperty( Toolkit::Control::Property::BACKGROUND, diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp index 10e7f78..c9bc2b3 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp @@ -676,7 +676,7 @@ std::string TextSelectionPopup::GetPressedImage() const DALI_LOG_INFO( gLogFilter, Debug::General, "TextSelectionPopup::AddOption\n" ); Toolkit::PushButton option = Toolkit::PushButton::New(); - option.SetName( button.name ); + option.SetProperty( Dali::Actor::Property::NAME, button.name ); option.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); switch( button.id ) @@ -763,7 +763,7 @@ std::string TextSelectionPopup::GetPressedImage() const Toolkit::Control divider = Toolkit::Control::New(); #ifdef DECORATOR_DEBUG - divider.SetName("Text's popup divider"); + divider.SetProperty( Dali::Actor::Property::NAME,"Text's popup divider"); #endif divider.SetSize( size ); divider.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); @@ -804,9 +804,9 @@ std::string TextSelectionPopup::GetPressedImage() const { mToolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, mPopupMaxSize ); } - mToolbar.SetParentOrigin( ParentOrigin::CENTER ); + mToolbar.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); #ifdef DECORATOR_DEBUG - mToolbar.SetName("TextSelectionToolbar"); + mToolbar.SetProperty( Dali::Actor::Property::NAME,"TextSelectionToolbar"); #endif self.Add( mToolbar ); } diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp index 358ace6..3a0ccfd 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp @@ -187,8 +187,8 @@ void TextSelectionToolbar::SetPopupMaxSize( const Size& maxSize ) mMaxSize = maxSize; if (mScrollView && mToolbarLayer ) { - mScrollView.SetMaximumSize( mMaxSize ); - mToolbarLayer.SetMaximumSize( mMaxSize ); + mScrollView.SetProperty( Actor::Property::MAXIMUM_SIZE, mMaxSize ); + mToolbarLayer.SetProperty( Actor::Property::MAXIMUM_SIZE, mMaxSize ); } } @@ -199,10 +199,10 @@ const Dali::Vector2& TextSelectionToolbar::GetPopupMaxSize() const void TextSelectionToolbar::SetUpScrollView() { - mScrollView.SetName("TextSelectionScrollView"); + mScrollView.SetProperty( Dali::Actor::Property::NAME,"TextSelectionScrollView"); mScrollView.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); - mScrollView.SetParentOrigin( ParentOrigin::CENTER_LEFT ); - mScrollView.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); + mScrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_LEFT ); + mScrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER_LEFT ); mScrollView.SetScrollingDirection( PanGestureDetector::DIRECTION_HORIZONTAL, Degree( 40.0f ) ); mScrollView.SetAxisAutoLock( true ); @@ -228,8 +228,8 @@ void TextSelectionToolbar::SetUp() // Create Layer to house the toolbar. mToolbarLayer = Layer::New(); mToolbarLayer.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); - mToolbarLayer.SetAnchorPoint( AnchorPoint::CENTER ); - mToolbarLayer.SetParentOrigin( ParentOrigin::CENTER ); + mToolbarLayer.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + mToolbarLayer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); if( !mScrollView ) { @@ -240,8 +240,8 @@ void TextSelectionToolbar::SetUp() // Toolbar must start with at least one option, adding further options with increase it's size mTableOfButtons = Dali::Toolkit::TableView::New( 1, 1 ); mTableOfButtons.SetFitHeight( 0 ); - mTableOfButtons.SetParentOrigin( ParentOrigin::CENTER_LEFT ); - mTableOfButtons.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); + mTableOfButtons.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_LEFT ); + mTableOfButtons.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER_LEFT ); mScrollView.Add( mTableOfButtons ); mToolbarLayer.Add( mScrollView ); @@ -256,15 +256,15 @@ void TextSelectionToolbar::SetUpScrollBar( bool enable ) if( ! mScrollBar ) { Toolkit::ImageView indicator = Toolkit::ImageView::New(); - indicator.SetParentOrigin( ParentOrigin::TOP_LEFT ); - indicator.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + indicator.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + indicator.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); indicator.SetStyleName( "TextSelectionScrollIndicator" ); mScrollBar = Toolkit::ScrollBar::New( Toolkit::ScrollBar::Horizontal ); - mScrollBar.SetName( "Text popup scroll bar" ); + mScrollBar.SetProperty( Dali::Actor::Property::NAME, "Text popup scroll bar" ); mScrollBar.SetStyleName( "TextSelectionScrollBar" ); - mScrollBar.SetParentOrigin( ParentOrigin::BOTTOM_LEFT ); - mScrollBar.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + mScrollBar.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_LEFT ); + mScrollBar.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); mScrollBar.SetPosition( mScrollBarPadding.x, -mScrollBarPadding.y ); mScrollBar.SetResizePolicy( Dali::ResizePolicy::FIT_TO_CHILDREN, Dali::Dimension::WIDTH ); mScrollBar.SetOrientation( Quaternion( Radian( 1.5f * Math::PI ), Vector3::ZAXIS ) ); @@ -285,13 +285,13 @@ void TextSelectionToolbar::OnScrollStarted( const Vector2& position ) { mScrollView.SetOvershootEnabled( true ); } - mTableOfButtons.SetSensitive( false ); + mTableOfButtons.SetProperty( Actor::Property::SENSITIVE, false ); } void TextSelectionToolbar::OnScrollCompleted( const Vector2& position ) { mFirstScrollEnd = true; - mTableOfButtons.SetSensitive( true ); + mTableOfButtons.SetProperty( Actor::Property::SENSITIVE, true ); } void TextSelectionToolbar::AddOption( Actor& option ) diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp index 441b640..1c95686 100644 --- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp +++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp @@ -300,9 +300,9 @@ void ToolBar::OnInitialize() // Layout mLayout = Toolkit::TableView::New( 1, 1 ); - mLayout.SetName( "TOOLBAR_LAYOUT" ); + mLayout.SetProperty( Dali::Actor::Property::NAME, "TOOLBAR_LAYOUT" ); mLayout.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - mLayout.SetParentOrigin( ParentOrigin::CENTER ); + mLayout.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Self().Add( mLayout ); diff --git a/dali-toolkit/internal/controls/tooltip/tooltip.cpp b/dali-toolkit/internal/controls/tooltip/tooltip.cpp index d9bb052..e8a5ebb 100644 --- a/dali-toolkit/internal/controls/tooltip/tooltip.cpp +++ b/dali-toolkit/internal/controls/tooltip/tooltip.cpp @@ -286,7 +286,7 @@ void Tooltip::SetContent( Toolkit::Control& control, const Property::Value& valu if( connectSignals && ! mSignalsConnected ) { control.HoveredSignal().Connect( this, &Tooltip::OnHovered ); - control.SetLeaveRequired( true ); + control.SetProperty( Actor::Property::LEAVE_REQUIRED, true ); mSignalsConnected = true; } } @@ -478,8 +478,8 @@ bool Tooltip::OnTimeout() mPopup.SetProperty( Toolkit::Popup::Property::ANIMATION_MODE, "NONE" ); mPopup.SetProperty( Toolkit::Popup::Property::BACKING_ENABLED, false ); // Disable the dimmed backing. mPopup.SetProperty( Toolkit::Popup::Property::TOUCH_TRANSPARENT, true ); // Let events pass through the popup - mPopup.SetParentOrigin( ParentOrigin::TOP_LEFT ); - mPopup.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + mPopup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + mPopup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Background mPopup.SetProperty( Toolkit::Popup::Property::POPUP_BACKGROUND_IMAGE, mBackgroundImage ); @@ -605,7 +605,7 @@ void Tooltip::OnRelayout( Actor actor ) Toolkit::Control control = mControl.GetHandle(); if( control ) { - Vector3 worldPos = control.GetCurrentWorldPosition(); + Vector3 worldPos = control.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ); float height = control.GetRelayoutSize( Dimension::HEIGHT ); position.x = stageSize.width * 0.5f + worldPos.x - popupWidth * 0.5f; @@ -619,7 +619,7 @@ void Tooltip::OnRelayout( Actor actor ) Toolkit::Control control = mControl.GetHandle(); if( control ) { - Vector3 worldPos = control.GetCurrentWorldPosition(); + Vector3 worldPos = control.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ); float height = control.GetRelayoutSize( Dimension::HEIGHT ); position.x = stageSize.width * 0.5f + worldPos.x - popupWidth * 0.5f; @@ -655,7 +655,7 @@ void Tooltip::OnRelayout( Actor actor ) if( yPosChanged && tail ) { // If we change the y position, then the tail may be shown pointing to the wrong control so just hide it. - tail.SetVisible( false ); + tail.SetProperty( Actor::Property::VISIBLE, false ); } mPopup.SetPosition( position ); diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp index 8c34ab5..d85be9a 100755 --- a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp +++ b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp @@ -737,8 +737,8 @@ void VideoView::UpdateDisplayArea( Dali::PropertyNotification& source ) Actor self( Self() ); bool positionUsesAnchorPoint = self.GetProperty( DevelActor::Property::POSITION_USES_ANCHOR_POINT ).Get< bool >(); - Vector3 actorSize = self.GetCurrentSize() * self.GetCurrentScale(); - Vector3 anchorPointOffSet = actorSize * ( positionUsesAnchorPoint ? self.GetCurrentAnchorPoint() : AnchorPoint::TOP_LEFT ); + Vector3 actorSize = self.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ) * self.GetCurrentProperty< Vector3 >( Actor::Property::SCALE ); + Vector3 anchorPointOffSet = actorSize * ( positionUsesAnchorPoint ? self.GetCurrentProperty< Vector3 >( Actor::Property::ANCHOR_POINT ) : AnchorPoint::TOP_LEFT ); Vector2 screenPosition = self.GetProperty( DevelActor::Property::SCREEN_POSITION ).Get< Vector2 >(); diff --git a/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.cpp b/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.cpp index dcb52fa..ed1d2b3 100755 --- a/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.cpp +++ b/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.cpp @@ -141,8 +141,8 @@ void DragAndDropDetector::OnPan(Dali::Actor actor, const PanGesture& gesture) mShadowControl.SetPosition(actorPos); mShadowControl.SetSize(width, height); mShadowControl.SetBackgroundColor(Vector4(0.3f, 0.3f, 0.3f, 0.7f)); - mShadowControl.SetParentOrigin(control.GetCurrentParentOrigin()); - mShadowControl.SetAnchorPoint(control.GetCurrentAnchorPoint()); + mShadowControl.SetProperty( Actor::Property::PARENT_ORIGIN, control.GetCurrentProperty< Vector3 >( Actor::Property::PARENT_ORIGIN ) ); + mShadowControl.SetProperty( Actor::Property::ANCHOR_POINT,control.GetCurrentProperty< Vector3 >( Actor::Property::ANCHOR_POINT )); control.GetParent().Add(mShadowControl); SetPosition(gesture.screenPosition); EmitStartedSignal(control); @@ -199,7 +199,7 @@ bool DragAndDropDetector::OnDrag(Dali::Actor actor, const Dali::TouchData& data) { SetPosition(data.GetScreenPosition(0)); ClearContent(); - SetContent(mDragControl.GetName()); + SetContent(mDragControl.GetProperty< std::string >( Dali::Actor::Property::NAME )); EmitDroppedSignal(control); } diff --git a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp index 5dabfb7..a5adec7 100644 --- a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp +++ b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp @@ -140,7 +140,7 @@ void BlurTwoPassFilter::Enable() // create actor to render input with applied emboss effect mActorForInput = Actor::New(); - mActorForInput.SetParentOrigin( ParentOrigin::CENTER ); + mActorForInput.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mActorForInput.SetSize( mTargetSize ); Renderer rendererForInput = CreateRenderer( BASIC_VERTEX_SOURCE, fragmentSource.c_str() ); SetRendererTexture( rendererForInput, mInputTexture ); @@ -153,7 +153,7 @@ void BlurTwoPassFilter::Enable() // create an actor to render mImageForHorz for vertical blur pass mActorForHorz = Actor::New(); - mActorForHorz.SetParentOrigin( ParentOrigin::CENTER ); + mActorForHorz.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mActorForHorz.SetSize( mTargetSize ); Renderer rendererForHorz = CreateRenderer( BASIC_VERTEX_SOURCE, fragmentSource.c_str() ); SetRendererTexture( rendererForHorz, textureForHorz ); @@ -170,7 +170,7 @@ void BlurTwoPassFilter::Enable() textureSetForBlending.SetTexture( 0u, blurredTexture ); textureSetForBlending.SetTexture( 1u, mInputTexture ); mActorForBlending.AddRenderer( rendererForBlending ); - mActorForBlending.SetParentOrigin( ParentOrigin::CENTER ); + mActorForBlending.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mActorForBlending.SetSize( mTargetSize ); for( int i = 0; i < kernelSize; ++i ) diff --git a/dali-toolkit/internal/filters/emboss-filter.cpp b/dali-toolkit/internal/filters/emboss-filter.cpp index d8349da..ed87213 100644 --- a/dali-toolkit/internal/filters/emboss-filter.cpp +++ b/dali-toolkit/internal/filters/emboss-filter.cpp @@ -97,7 +97,7 @@ void EmbossFilter::Enable() // create actor to render input with applied emboss effect mActorForInput1 = Actor::New(); - mActorForInput1.SetParentOrigin( ParentOrigin::CENTER ); + mActorForInput1.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mActorForInput1.SetSize(mTargetSize); Vector2 textureScale( 1.5f/mTargetSize.width, 1.5f/mTargetSize.height); mActorForInput1.RegisterProperty( TEX_SCALE_UNIFORM_NAME, textureScale ); @@ -109,7 +109,7 @@ void EmbossFilter::Enable() mRootActor.Add( mActorForInput1 ); mActorForInput2 = Actor::New(); - mActorForInput2.SetParentOrigin( ParentOrigin::CENTER ); + mActorForInput2.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mActorForInput2.SetSize(mTargetSize); mActorForInput2.RegisterProperty( TEX_SCALE_UNIFORM_NAME, textureScale ); mActorForInput2.RegisterProperty( COEFFICIENT_UNIFORM_NAME, Vector3( -1.f, -1.f, 2.f ) ); @@ -120,9 +120,9 @@ void EmbossFilter::Enable() mRootActor.Add( mActorForInput2 ); mActorForComposite = Actor::New(); - mActorForComposite.SetParentOrigin( ParentOrigin::CENTER ); + mActorForComposite.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mActorForComposite.SetSize(mTargetSize); - mActorForComposite.SetColor( Color::BLACK ); + mActorForComposite.SetProperty( Actor::Property::COLOR, Color::BLACK ); mRootActor.Add( mActorForComposite ); diff --git a/dali-toolkit/internal/filters/image-filter.cpp b/dali-toolkit/internal/filters/image-filter.cpp index e90e07e..c33cbfe 100644 --- a/dali-toolkit/internal/filters/image-filter.cpp +++ b/dali-toolkit/internal/filters/image-filter.cpp @@ -121,7 +121,7 @@ void ImageFilter::SetupCamera() { // create a camera for the render task, corresponding to its render target size mCameraActor = CameraActor::New(mTargetSize); - mCameraActor.SetParentOrigin(ParentOrigin::CENTER); + mCameraActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mCameraActor.SetInvertYAxis( true ); mRootActor.Add( mCameraActor ); } diff --git a/dali-toolkit/internal/filters/spread-filter.cpp b/dali-toolkit/internal/filters/spread-filter.cpp index 5100821..216f3a0 100644 --- a/dali-toolkit/internal/filters/spread-filter.cpp +++ b/dali-toolkit/internal/filters/spread-filter.cpp @@ -84,7 +84,7 @@ void SpreadFilter::Enable() { // create actor to render input with applied emboss effect mActorForInput = Actor::New(); - mActorForInput.SetParentOrigin( ParentOrigin::CENTER ); + mActorForInput.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mActorForInput.SetSize(mTargetSize); // register properties as shader uniforms mActorForInput.RegisterProperty( SPREAD_UNIFORM_NAME, mSpread ); @@ -101,7 +101,7 @@ void SpreadFilter::Enable() // create an actor to render mImageForHorz for vertical blur pass mActorForHorz = Actor::New(); - mActorForHorz.SetParentOrigin( ParentOrigin::CENTER ); + mActorForHorz.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mActorForHorz.SetSize(mTargetSize); // register properties as shader uniforms mActorForHorz.RegisterProperty( SPREAD_UNIFORM_NAME, mSpread ); diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp index 691f9ab..0960d91 100644 --- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp +++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp @@ -739,8 +739,8 @@ Actor KeyboardFocusManager::GetFocusIndicatorActor() mFocusIndicatorActor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); } - mFocusIndicatorActor.SetParentOrigin( ParentOrigin::CENTER ); - mFocusIndicatorActor.SetAnchorPoint( AnchorPoint::CENTER ); + mFocusIndicatorActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mFocusIndicatorActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); mFocusIndicatorActor.SetPosition(0.0f, 0.0f); return mFocusIndicatorActor; diff --git a/dali-toolkit/internal/text/decorator/text-decorator.cpp b/dali-toolkit/internal/text/decorator/text-decorator.cpp index 0cb8b4c..b9b62d3 100644 --- a/dali-toolkit/internal/text/decorator/text-decorator.cpp +++ b/dali-toolkit/internal/text/decorator/text-decorator.cpp @@ -300,7 +300,7 @@ struct Decorator::Impl : public ConnectionTracker cursor.position.y ); mPrimaryCursor.SetSize( Size( mCursorWidth, cursor.cursorHeight ) ); } - mPrimaryCursor.SetVisible( mPrimaryCursorVisible && mCursorBlinkStatus ); + mPrimaryCursor.SetProperty( Actor::Property::VISIBLE, mPrimaryCursorVisible && mCursorBlinkStatus ); } if( mSecondaryCursor ) { @@ -315,7 +315,7 @@ struct Decorator::Impl : public ConnectionTracker cursor.position.y ); mSecondaryCursor.SetSize( Size( mCursorWidth, cursor.cursorHeight ) ); } - mSecondaryCursor.SetVisible( mSecondaryCursorVisible && mCursorBlinkStatus ); + mSecondaryCursor.SetProperty( Actor::Property::VISIBLE, mSecondaryCursorVisible && mCursorBlinkStatus ); } // Show or hide the grab handle @@ -346,7 +346,7 @@ struct Decorator::Impl : public ConnectionTracker if( grabHandle.actor ) { - grabHandle.actor.SetVisible( isVisible ); + grabHandle.actor.SetProperty( Actor::Property::VISIBLE, isVisible ); } } else if( grabHandle.actor ) @@ -405,11 +405,11 @@ struct Decorator::Impl : public ConnectionTracker if( primary.actor ) { - primary.actor.SetVisible( primaryVisible ); + primary.actor.SetProperty( Actor::Property::VISIBLE, primaryVisible ); } if( secondary.actor ) { - secondary.actor.SetVisible( secondaryVisible ); + secondary.actor.SetProperty( Actor::Property::VISIBLE, secondaryVisible ); } } @@ -499,7 +499,7 @@ struct Decorator::Impl : public ConnectionTracker if( primaryHandle.active || secondaryHandle.active ) { // The origin of the decorator's coordinate system in world coords. - const Vector3 originWorldCoords = mActiveLayer.GetCurrentWorldPosition() - mActiveLayer.GetCurrentSize() * ACTIVE_LAYER_ANCHOR_POINT; + const Vector3 originWorldCoords = mActiveLayer.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ) - mActiveLayer.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ) * ACTIVE_LAYER_ANCHOR_POINT; if( preferBelow ) { @@ -584,7 +584,7 @@ struct Decorator::Impl : public ConnectionTracker // Check first the horizontal dimension. If is not within the boundaries, it calculates the offset. // The origin of the decorator's coordinate system in world coords. - const Vector3 originWorldCoords = mActiveLayer.GetCurrentWorldPosition() - mActiveLayer.GetCurrentSize() * ACTIVE_LAYER_ANCHOR_POINT; + const Vector3 originWorldCoords = mActiveLayer.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ) - mActiveLayer.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ) * ACTIVE_LAYER_ANCHOR_POINT; // The popup's position in world coords. Vector3 popupPositionWorldCoords = originWorldCoords + mCopyPastePopup.position; @@ -659,8 +659,8 @@ struct Decorator::Impl : public ConnectionTracker { cursor = Control::New(); cursor.SetBackgroundColor( color ); - cursor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - cursor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + cursor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + cursor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); } // Add or Remove cursor(s) from parent @@ -687,7 +687,7 @@ struct Decorator::Impl : public ConnectionTracker { CreateCursor( mPrimaryCursor, mCursor[PRIMARY_CURSOR].color ); #ifdef DECORATOR_DEBUG - mPrimaryCursor.SetName( "PrimaryCursorActor" ); + mPrimaryCursor.SetProperty( Dali::Actor::Property::NAME, "PrimaryCursorActor" ); #endif } @@ -703,7 +703,7 @@ struct Decorator::Impl : public ConnectionTracker { CreateCursor( mSecondaryCursor, mCursor[SECONDARY_CURSOR].color ); #ifdef DECORATOR_DEBUG - mSecondaryCursor.SetName( "SecondaryCursorActor" ); + mSecondaryCursor.SetProperty( Dali::Actor::Property::NAME, "SecondaryCursorActor" ); #endif } @@ -729,11 +729,11 @@ struct Decorator::Impl : public ConnectionTracker // Cursor blinking if ( mPrimaryCursor ) { - mPrimaryCursor.SetVisible( mPrimaryCursorVisible && mCursorBlinkStatus ); + mPrimaryCursor.SetProperty( Actor::Property::VISIBLE, mPrimaryCursorVisible && mCursorBlinkStatus ); } if ( mSecondaryCursor ) { - mSecondaryCursor.SetVisible( mSecondaryCursorVisible && mCursorBlinkStatus ); + mSecondaryCursor.SetProperty( Actor::Property::VISIBLE, mSecondaryCursorVisible && mCursorBlinkStatus ); } mCursorBlinkStatus = !mCursorBlinkStatus; @@ -769,10 +769,10 @@ struct Decorator::Impl : public ConnectionTracker { mActiveLayer = Layer::New(); #ifdef DECORATOR_DEBUG - mActiveLayer.SetName ( "ActiveLayerActor" ); + mActiveLayer.SetProperty( Actor::Property::NAME, "ActiveLayerActor" ); #endif - mActiveLayer.SetParentOrigin( ParentOrigin::CENTER ); + mActiveLayer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mActiveLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); // Add the active layer telling the controller it doesn't need clipping. @@ -799,33 +799,33 @@ struct Decorator::Impl : public ConnectionTracker { grabHandle.actor = ImageView::New( mHandleImages[GRAB_HANDLE][HANDLE_IMAGE_RELEASED] ); GetImpl( grabHandle.actor).SetDepthIndex( DepthIndex::DECORATION ); - grabHandle.actor.SetAnchorPoint( AnchorPoint::TOP_CENTER ); + grabHandle.actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER ); // Area that Grab handle responds to, larger than actual handle so easier to move #ifdef DECORATOR_DEBUG - grabHandle.actor.SetName( "GrabHandleActor" ); + grabHandle.actor.SetProperty( Dali::Actor::Property::NAME, "GrabHandleActor" ); if ( Dali::Internal::gLogFilter->IsEnabledFor( Debug::Verbose ) ) { grabHandle.grabArea = Control::New(); Toolkit::Control control = Toolkit::Control::DownCast( grabHandle.grabArea ); control.SetBackgroundColor( Vector4( 1.0f, 1.0f, 1.0f, 0.5f ) ); - grabHandle.grabArea.SetName( "GrabArea" ); + grabHandle.grabArea.SetProperty( Dali::Actor::Property::NAME, "GrabArea" ); } else { grabHandle.grabArea = Actor::New(); - grabHandle.grabArea.SetName( "GrabArea" ); + grabHandle.grabArea.SetProperty( Dali::Actor::Property::NAME, "GrabArea" ); } #else grabHandle.grabArea = Actor::New(); #endif - grabHandle.grabArea.SetParentOrigin( ParentOrigin::TOP_CENTER ); - grabHandle.grabArea.SetAnchorPoint( AnchorPoint::TOP_CENTER ); + grabHandle.grabArea.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER ); + grabHandle.grabArea.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER ); grabHandle.grabArea.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); grabHandle.grabArea.SetSizeModeFactor( DEFAULT_GRAB_HANDLE_RELATIVE_SIZE ); grabHandle.actor.Add( grabHandle.grabArea ); - grabHandle.actor.SetColor( mHandleColor ); + grabHandle.actor.SetProperty( Actor::Property::COLOR, mHandleColor ); grabHandle.grabArea.TouchSignal().Connect( this, &Decorator::Impl::OnGrabHandleTouched ); @@ -853,20 +853,20 @@ struct Decorator::Impl : public ConnectionTracker if( image ) { handle.markerActor = ImageView::New( image ); - handle.markerActor.SetColor( mHandleColor ); + handle.markerActor.SetProperty( Actor::Property::COLOR, mHandleColor ); handle.actor.Add( handle.markerActor ); handle.markerActor.SetResizePolicy ( ResizePolicy::FIXED, Dimension::HEIGHT ); if( LEFT_SELECTION_HANDLE == handleType ) { - handle.markerActor.SetAnchorPoint( AnchorPoint::BOTTOM_RIGHT ); - handle.markerActor.SetParentOrigin( ParentOrigin::TOP_RIGHT ); + handle.markerActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_RIGHT ); + handle.markerActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_RIGHT ); } else if( RIGHT_SELECTION_HANDLE == handleType ) { - handle.markerActor.SetAnchorPoint( AnchorPoint::BOTTOM_LEFT ); - handle.markerActor.SetParentOrigin( ParentOrigin::TOP_LEFT ); + handle.markerActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_LEFT ); + handle.markerActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); } } } @@ -880,19 +880,19 @@ struct Decorator::Impl : public ConnectionTracker { primary.actor = ImageView::New( mHandleImages[LEFT_SELECTION_HANDLE][HANDLE_IMAGE_RELEASED] ); #ifdef DECORATOR_DEBUG - primary.actor.SetName("SelectionHandleOne"); + primary.actor.SetProperty( Dali::Actor::Property::NAME,"SelectionHandleOne"); #endif - primary.actor.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); // Change to BOTTOM_RIGHT if Look'n'Feel requires handle above text. + primary.actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT ); // Change to BOTTOM_RIGHT if Look'n'Feel requires handle above text. GetImpl( primary.actor ).SetDepthIndex( DepthIndex::DECORATION ); - primary.actor.SetColor( mHandleColor ); + primary.actor.SetProperty( Actor::Property::COLOR, mHandleColor ); primary.grabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move #ifdef DECORATOR_DEBUG - primary.grabArea.SetName("SelectionHandleOneGrabArea"); + primary.grabArea.SetProperty( Dali::Actor::Property::NAME,"SelectionHandleOneGrabArea"); #endif primary.grabArea.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); - primary.grabArea.SetParentOrigin( ParentOrigin::TOP_CENTER ); - primary.grabArea.SetAnchorPoint( AnchorPoint::TOP_CENTER ); + primary.grabArea.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER ); + primary.grabArea.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER ); primary.grabArea.SetSizeModeFactor( DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE ); primary.grabArea.TouchSignal().Connect( this, &Decorator::Impl::OnHandleOneTouched ); @@ -924,19 +924,19 @@ struct Decorator::Impl : public ConnectionTracker { secondary.actor = ImageView::New( mHandleImages[RIGHT_SELECTION_HANDLE][HANDLE_IMAGE_RELEASED] ); #ifdef DECORATOR_DEBUG - secondary.actor.SetName("SelectionHandleTwo"); + secondary.actor.SetProperty( Dali::Actor::Property::NAME,"SelectionHandleTwo"); #endif - secondary.actor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); // Change to BOTTOM_LEFT if Look'n'Feel requires handle above text. + secondary.actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); // Change to BOTTOM_LEFT if Look'n'Feel requires handle above text. GetImpl( secondary.actor ).SetDepthIndex( DepthIndex::DECORATION ); - secondary.actor.SetColor( mHandleColor ); + secondary.actor.SetProperty( Actor::Property::COLOR, mHandleColor ); secondary.grabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move #ifdef DECORATOR_DEBUG - secondary.grabArea.SetName("SelectionHandleTwoGrabArea"); + secondary.grabArea.SetProperty( Dali::Actor::Property::NAME,"SelectionHandleTwoGrabArea"); #endif secondary.grabArea.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); - secondary.grabArea.SetParentOrigin( ParentOrigin::TOP_CENTER ); - secondary.grabArea.SetAnchorPoint( AnchorPoint::TOP_CENTER ); + secondary.grabArea.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER ); + secondary.grabArea.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER ); secondary.grabArea.SetSizeModeFactor( DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE ); secondary.grabArea.TouchSignal().Connect( this, &Decorator::Impl::OnHandleTwoTouched ); @@ -965,7 +965,7 @@ struct Decorator::Impl : public ConnectionTracker void CalculateHandleWorldCoordinates( HandleImpl& handle, Vector2& position ) { // Gets the world position of the active layer. The active layer is where the handles are added. - const Vector3 parentWorldPosition = mActiveLayer.GetCurrentWorldPosition(); + const Vector3 parentWorldPosition = mActiveLayer.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ); // The grab handle position in world coords. // The active layer's world position is the center of the active layer. The origin of the @@ -980,9 +980,9 @@ struct Decorator::Impl : public ConnectionTracker HandleImpl& grabHandle = mHandle[GRAB_HANDLE]; // Transforms the handle position into world coordinates. - // @note This is not the same value as grabHandle.actor.GetCurrentWorldPosition() + // @note This is not the same value as grabHandle.actor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ) // as it's transforming the handle's position set by the text-controller and not - // the final position set to the actor. Another difference is the GetCurrentWorldPosition() + // the final position set to the actor. Another difference is the.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ) // retrieves the position of the center of the actor but the handle's position set // by the text controller is not the center of the actor. Vector2 grabHandleWorldPosition; @@ -1016,9 +1016,9 @@ struct Decorator::Impl : public ConnectionTracker HandleImpl& handle = mHandle[type]; // Transforms the handle position into world coordinates. - // @note This is not the same value as handle.actor.GetCurrentWorldPosition() + // @note This is not the same value as handle.actor.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ) // as it's transforming the handle's position set by the text-controller and not - // the final position set to the actor. Another difference is the GetCurrentWorldPosition() + // the final position set to the actor. Another difference is the.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_POSITION ) // retrieves the position of the center of the actor but the handle's position set // by the text controller is not the center of the actor. Vector2 handleWorldPosition; @@ -1067,7 +1067,7 @@ struct Decorator::Impl : public ConnectionTracker if( handle.actor && !handle.horizontallyFlipped ) { // Change the anchor point to flip the image. - handle.actor.SetAnchorPoint( isPrimaryHandle ? AnchorPoint::TOP_LEFT : AnchorPoint::TOP_RIGHT ); + handle.actor.SetProperty( Actor::Property::ANCHOR_POINT, isPrimaryHandle ? AnchorPoint::TOP_LEFT : AnchorPoint::TOP_RIGHT ); handle.horizontallyFlipped = true; } @@ -1077,7 +1077,7 @@ struct Decorator::Impl : public ConnectionTracker if( handle.actor && handle.horizontallyFlipped ) { // Reset the anchor point. - handle.actor.SetAnchorPoint( isPrimaryHandle ? AnchorPoint::TOP_RIGHT : AnchorPoint::TOP_LEFT ); + handle.actor.SetProperty( Actor::Property::ANCHOR_POINT, isPrimaryHandle ? AnchorPoint::TOP_RIGHT : AnchorPoint::TOP_LEFT ); handle.horizontallyFlipped = false; } @@ -1148,10 +1148,10 @@ struct Decorator::Impl : public ConnectionTracker { mHighlightActor = Actor::New(); - mHighlightActor.SetName( "HighlightActor" ); - mHighlightActor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - mHighlightActor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - mHighlightActor.SetColor( mHighlightColor ); + mHighlightActor.SetProperty( Dali::Actor::Property::NAME, "HighlightActor" ); + mHighlightActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + mHighlightActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + mHighlightActor.SetProperty( Actor::Property::COLOR, mHighlightColor ); mHighlightActor.SetColorMode( USE_OWN_COLOR ); } @@ -2268,9 +2268,9 @@ void Decorator::SetEnabledPopupButtons( TextSelectionPopup::Buttons& enabledButt { mImpl->mCopyPastePopup.actor = TextSelectionPopup::New( &mImpl->mTextSelectionPopupCallbackInterface ); #ifdef DECORATOR_DEBUG - mImpl->mCopyPastePopup.actor.SetName("mCopyPastePopup"); + mImpl->mCopyPastePopup.actor.SetProperty( Dali::Actor::Property::NAME,"mCopyPastePopup"); #endif - mImpl->mCopyPastePopup.actor.SetAnchorPoint( AnchorPoint::CENTER ); + mImpl->mCopyPastePopup.actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); mImpl->mCopyPastePopup.actor.OnRelayoutSignal().Connect( mImpl, &Decorator::Impl::SetPopupPosition ); // Position popup after size negotiation } diff --git a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp index dddb301..0b1f2e2 100755 --- a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp +++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp @@ -369,8 +369,8 @@ struct AtlasRenderer::Impl { // Create a container actor to act as a common parent for text and shadow, to avoid color inheritence issues. mActor = Actor::New(); - mActor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - mActor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + mActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + mActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); mActor.SetSize( textSize ); mActor.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR ); } @@ -403,7 +403,7 @@ struct AtlasRenderer::Impl Actor shadowActor = CreateMeshActor(textControl, animatablePropertyIndex, color, meshRecord, textSize, STYLE_DROP_SHADOW ); #if defined(DEBUG_ENABLED) - shadowActor.SetName( "Text Shadow renderable actor" ); + shadowActor.SetProperty( Dali::Actor::Property::NAME, "Text Shadow renderable actor" ); #endif // Offset shadow in x and y shadowActor.RegisterProperty("uOffset", shadowOffset ); @@ -736,12 +736,12 @@ struct AtlasRenderer::Impl Actor actor = Actor::New(); #if defined(DEBUG_ENABLED) - actor.SetName( "Text renderable actor" ); + actor.SetProperty( Dali::Actor::Property::NAME, "Text renderable actor" ); #endif actor.AddRenderer( renderer ); // Keep all of the origins aligned - actor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - actor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actor.SetSize( actorSize ); actor.RegisterProperty("uOffset", Vector2::ZERO ); actor.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR ); diff --git a/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp b/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp index 7fccc8d..8e6e0f2 100644 --- a/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp +++ b/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.cpp @@ -190,11 +190,11 @@ Actor VectorBasedRenderer::Render( Text::ViewInterface& view, UnparentAndReset( mImpl->mActor ); mImpl->mActor = Actor::New(); - mImpl->mActor.SetParentOrigin( ParentOrigin::CENTER ); + mImpl->mActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mImpl->mActor.SetSize( view.GetControlSize() ); - mImpl->mActor.SetColor( Color::WHITE ); + mImpl->mActor.SetProperty( Actor::Property::COLOR, Color::WHITE ); #if defined(DEBUG_ENABLED) - mImpl->mActor.SetName( "Text renderable actor" ); + mImpl->mActor.SetProperty( Dali::Actor::Property::NAME, "Text renderable actor" ); #endif Length numberOfGlyphs = view.GetNumberOfGlyphs(); diff --git a/dali-toolkit/internal/text/text-controller-impl.cpp b/dali-toolkit/internal/text/text-controller-impl.cpp index 4df4d38..9e270f4 100755 --- a/dali-toolkit/internal/text/text-controller-impl.cpp +++ b/dali-toolkit/internal/text/text-controller-impl.cpp @@ -3402,9 +3402,9 @@ Actor Controller::Impl::CreateBackgroundActor() renderer.SetProperty( Dali::Renderer::Property::DEPTH_INDEX, DepthIndex::CONTENT ); actor = Actor::New(); - actor.SetName( "TextBackgroundColorActor" ); - actor.SetParentOrigin( ParentOrigin::TOP_LEFT ); - actor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + actor.SetProperty( Dali::Actor::Property::NAME, "TextBackgroundColorActor" ); + actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); actor.SetSize( textSize ); actor.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR ); actor.AddRenderer( renderer ); diff --git a/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp index 3026d9c..b1df2b9 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp +++ b/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp @@ -105,7 +105,7 @@ void CubeTransitionCrossEffect::OnStartTransition( Vector2 panPosition, Vector2 } } - const Vector2 halfSize = Self().GetCurrentSize().GetVectorXY() * 0.5f; + const Vector2 halfSize = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).GetVectorXY() * 0.5f; //the centre to "explode" the tiles outwards from Vector3 centre( halfSize.x, halfSize.y, -1.0f / mDisplacementSpreadFactor ); @@ -129,7 +129,7 @@ void CubeTransitionCrossEffect::OnStartTransition( Vector2 panPosition, Vector2 void CubeTransitionCrossEffect::SetupAnimation( unsigned int actorIndex, unsigned int x, unsigned int y, float angle, const Vector3 axis, const Vector3& displacementCentre ) { - const Vector2 size = Self().GetCurrentSize().GetVectorXY(); + const Vector2 size = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).GetVectorXY(); Vector2 halfSize = size * 0.5f; //the position of the centre of the front face tile diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp index 460ea31..d151290 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp +++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp @@ -82,7 +82,7 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( Actor CreateTile( const Vector4& samplerRect ) { Actor tile = Actor::New(); - tile.SetAnchorPoint( AnchorPoint::CENTER ); + tile.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); tile.RegisterProperty( "uTextureRect", samplerRect ); return tile; } @@ -113,7 +113,7 @@ void CubeTransitionEffect::SetTargetRight( unsigned int idx ) mBoxes[ idx ].SetProperty(Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.x * 0.5f ); - mTargetTiles[ idx ].SetParentOrigin( Vector3( 1.f, 0.5f, 0.5f) ); + mTargetTiles[ idx ].SetProperty( Actor::Property::PARENT_ORIGIN, Vector3( 1.f, 0.5f, 0.5f) ); mTargetTiles[ idx ].SetOrientation( Degree( 90.f ), Vector3::YAXIS ); } @@ -123,7 +123,7 @@ void CubeTransitionEffect::SetTargetLeft( unsigned int idx ) mBoxes[ idx ].SetProperty(Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.x * 0.5f ); - mTargetTiles[ idx ].SetParentOrigin( Vector3( 0.f, 0.5f, 0.5f) ); + mTargetTiles[ idx ].SetProperty( Actor::Property::PARENT_ORIGIN, Vector3( 0.f, 0.5f, 0.5f) ); mTargetTiles[ idx ].SetOrientation( Degree( -90.f ), Vector3::YAXIS ); } @@ -133,7 +133,7 @@ void CubeTransitionEffect::SetTargetBottom( unsigned int idx ) mBoxes[ idx ].SetProperty(Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.y * 0.5f ); - mTargetTiles[ idx ].SetParentOrigin( Vector3( 0.5f, 0.f, 0.5f) ); + mTargetTiles[ idx ].SetProperty( Actor::Property::PARENT_ORIGIN, Vector3( 0.5f, 0.f, 0.5f) ); mTargetTiles[ idx ].SetOrientation( Degree( 90.f ), Vector3::XAXIS ); } @@ -143,7 +143,7 @@ void CubeTransitionEffect::SetTargetTop( unsigned int idx ) mBoxes[ idx ].SetProperty(Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.y * 0.5f ); - mTargetTiles[ idx ].SetParentOrigin( Vector3( 0.5f, 1.f, 0.5f) ); + mTargetTiles[ idx ].SetProperty( Actor::Property::PARENT_ORIGIN, Vector3( 0.5f, 1.f, 0.5f) ); mTargetTiles[ idx ].SetOrientation( Degree( -90.f ), Vector3::XAXIS ); } @@ -199,8 +199,8 @@ void CubeTransitionEffect::Initialize() //create the box parents mBoxRoot = Actor::New(); - mBoxRoot.SetParentOrigin( ParentOrigin::CENTER ); - mBoxRoot.SetAnchorPoint( AnchorPoint::CENTER ); + mBoxRoot.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mBoxRoot.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); mCurrentTiles.clear(); mTargetTiles.clear(); @@ -221,7 +221,7 @@ void CubeTransitionEffect::Initialize() Actor currentTile = CreateTile( textureRect ); currentTile.SetProperty( Actor::Property::COLOR, FULL_BRIGHTNESS ); - currentTile.SetParentOrigin( ParentOrigin::CENTER ); + currentTile.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mCurrentTiles.push_back( currentTile ); Actor targetTile = CreateTile( textureRect ); @@ -229,8 +229,8 @@ void CubeTransitionEffect::Initialize() mTargetTiles.push_back( targetTile ); Actor box = Actor::New(); - box.SetParentOrigin( anchor + offset ); - box.SetAnchorPoint( AnchorPoint::CENTER ); + box.SetProperty( Actor::Property::PARENT_ORIGIN, anchor + offset ); + box.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); box.Add( currentTile ); box.Add( targetTile ); @@ -338,7 +338,7 @@ void CubeTransitionEffect::SetTargetTexture( Texture texture ) void CubeTransitionEffect::StartTransition( bool toNextImage ) { - Vector3 size = Self().GetCurrentSize(); + Vector3 size = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); if( toNextImage ) { StartTransition( Vector2(size.x* 0.5f, size.y*0.5f), Vector2( -10.f, 0.f ) ); @@ -378,7 +378,7 @@ void CubeTransitionEffect::StartTransition( Vector2 panPosition, Vector2 panDisp for( ActorArray::iterator it = mCurrentTiles.begin(); it != mCurrentTiles.end(); ++it ) { - it->SetParentOrigin( Vector3( 0.5f, 0.5f, 1.0f) ); + it->SetProperty( Actor::Property::PARENT_ORIGIN, Vector3( 0.5f, 0.5f, 1.0f) ); it->SetProperty( Actor::Property::ORIENTATION, Quaternion( Radian( 0.0f ), Vector3::XAXIS ) ); it->AddRenderer( mCurrentRenderer ); } @@ -440,7 +440,7 @@ void CubeTransitionEffect::ResetToInitialState() for( ActorArray::iterator it = mCurrentTiles.begin(); it != mCurrentTiles.end(); ++it ) { - it->SetParentOrigin( Vector3( 0.5f, 0.5f, 1.0f) ); + it->SetProperty( Actor::Property::PARENT_ORIGIN, Vector3( 0.5f, 0.5f, 1.0f) ); it->SetProperty( Actor::Property::ORIENTATION, Quaternion( Radian( 0.0f ), Vector3::XAXIS ) ); it->SetProperty( Actor::Property::COLOR, FULL_BRIGHTNESS ); } diff --git a/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp index 8cd84be..b1feba8 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp +++ b/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp @@ -132,7 +132,7 @@ void CubeTransitionFoldEffect::SetupAnimation( unsigned int actorIndex, unsigned float delta = (float)x * mTileSize.x * ( 1.4142f - 1.0f ); - Vector3 position( mBoxes[ actorIndex ].GetCurrentPosition() ); + Vector3 position( mBoxes[ actorIndex ].GetCurrentProperty< Vector3 >( Actor::Property::POSITION ) ); mAnimation.AnimateTo( Property( mBoxes[ actorIndex ], Actor::Property::ORIENTATION ), Quaternion( Radian( angle ), Vector3::YAXIS ), AlphaFunction::LINEAR ); mAnimation.AnimateTo( Property( mBoxes[ actorIndex ], Actor::Property::POSITION_X ), position.x + delta, AlphaFunction::BOUNCE ); diff --git a/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp index 525a61e..c9fdb2e 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp +++ b/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp @@ -109,7 +109,7 @@ void CubeTransitionWaveEffect::OnStartTransition( Vector2 panPosition, Vector2 p void CubeTransitionWaveEffect::CalculateSaddleSurfaceParameters( Vector2 position, Vector2 displacement ) { - const Vector2 size = Self().GetCurrentSize().GetVectorXY(); + const Vector2 size = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).GetVectorXY(); // the line passes through 'position' and has the direction of 'displacement' float coefA, coefB, coefC; //line equation: Ax+By+C=0; coefA = displacement.y; diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp index 9b3fb7e..ec041e9 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp @@ -570,7 +570,7 @@ void AnimatedVectorImageVisual::OnSizeNotification( PropertyNotification& source Actor actor = mPlacementActor.GetHandle(); if( actor ) { - Vector3 size = actor.GetCurrentSize(); + Vector3 size = actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); mVisualSize.width = size.width; mVisualSize.height = size.height; diff --git a/dali-toolkit/public-api/controls/buttons/check-box-button.h b/dali-toolkit/public-api/controls/buttons/check-box-button.h index 8b4c8cf..9322a46 100644 --- a/dali-toolkit/public-api/controls/buttons/check-box-button.h +++ b/dali-toolkit/public-api/controls/buttons/check-box-button.h @@ -59,7 +59,7 @@ class CheckBoxButton; * void HelloWorldExample::Create( Application& application ) * { * CheckBoxButton button = CheckBoxButton::New(); - * button.SetParentOrigin( ParentOrigin::CENTER ); + * button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); * button.SetProperty( Button::Property::LABEL, "Check" ); * button.SetSize( 200, 40 ); * button.SetBackgroundColor( Color::WHITE ); diff --git a/dali-toolkit/public-api/controls/buttons/push-button.h b/dali-toolkit/public-api/controls/buttons/push-button.h index fdcc657..097f8fa 100644 --- a/dali-toolkit/public-api/controls/buttons/push-button.h +++ b/dali-toolkit/public-api/controls/buttons/push-button.h @@ -53,7 +53,7 @@ class PushButton; * void HelloWorldExample::Create( Application& application ) * { * PushButton button = PushButton::New(); - * button.SetParentOrigin( ParentOrigin::CENTER ); + * button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); * button.SetProperty( Button::Property::LABEL, "Press" ); * Stage::GetCurrent().Add( button ); * diff --git a/dali-toolkit/public-api/controls/buttons/radio-button.h b/dali-toolkit/public-api/controls/buttons/radio-button.h index 2793710..18a999a 100644 --- a/dali-toolkit/public-api/controls/buttons/radio-button.h +++ b/dali-toolkit/public-api/controls/buttons/radio-button.h @@ -64,7 +64,7 @@ class RadioButton; * * // Create a group to bind two or more RadioButtons together * Actor radioGroup = Actor::New(); - * radioGroup.SetParentOrigin( ParentOrigin::CENTER ); + * radioGroup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); * Stage::GetCurrent().Add( radioGroup ); * * // Make the first RadioButton and add it to its parent diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index c469d1c..1be8bd6 100755 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -501,7 +501,7 @@ void Control::OnPinch(const PinchGesture& pinch) if( pinch.state == Gesture::Started ) { - *( mImpl->mStartingPinchScale ) = Self().GetCurrentScale(); + *( mImpl->mStartingPinchScale ) = Self().GetCurrentProperty< Vector3 >( Actor::Property::SCALE ); } Self().SetScale( *( mImpl->mStartingPinchScale ) * pinch.scale ); @@ -686,7 +686,7 @@ void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dime Vector3 Control::GetNaturalSize() { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::GetNaturalSize for %s\n", Self().GetName().c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::GetNaturalSize for %s\n", Self().GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str() ); Toolkit::Visual::Base visual = mImpl->GetVisual( Toolkit::Control::Property::BACKGROUND ); if( visual ) { diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h index 2822027..4acf64c 100755 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h @@ -875,7 +875,7 @@ public: * * @SINCE_1_0.0 * @param[in] sensitive @c true to enable scroll, @c false to disable scrolling - * @note Unlike Actor::SetSensitive(), this determines whether this ScrollView + * @note Unlike Actor::Property::SENSITIVE, this determines whether this ScrollView * should react (e.g. pan), without disrupting the sensitivity of its children. * */ diff --git a/docs/content/example-code/properties.cpp b/docs/content/example-code/properties.cpp index a68bb02..c1669f7 100644 --- a/docs/content/example-code/properties.cpp +++ b/docs/content/example-code/properties.cpp @@ -83,8 +83,8 @@ public: // Create text label mTagText = Toolkit::TextLabel::New( "0" ); - mTagText.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); - mTagText.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); + mTagText.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER ); + mTagText.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); mTagText.SetProperty( TextLabel::Property::TEXT_COLOR, Color::WHITE ); mTagText.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); stage.Add( mTagText ); diff --git a/docs/content/programming-guide/animation-multi-threading-notes.h b/docs/content/programming-guide/animation-multi-threading-notes.h index 4c06450..631aae6 100644 --- a/docs/content/programming-guide/animation-multi-threading-notes.h +++ b/docs/content/programming-guide/animation-multi-threading-notes.h @@ -13,9 +13,9 @@ An example actor hierachy is shown below, in which one of the actors is being an

Reading an animated value

-When a property is animatable, it can only be modified in the rendering thread. The value returned from a getter method, is the value used when the previous frame was rendered. +When a property is animatable, it can only be modified in the rendering thread. The value returned from the property, is the value used when the previous frame was rendered. -For example \ref Dali::Actor::GetCurrentPosition "Dali::Actor::GetCurrentPosition" returns the position at which the Actor was last rendered. Since \ref Dali::Actor::SetPosition "Dali::Actor::SetPosition" is asynchronous, a call to \ref Dali::Actor::GetCurrentPosition "Dali::Actor::GetCurrentPosition" won't immediately return the same value. +For example \ref Dali::Actor::Property::POSITION "Dali::Actor::Property::POSITION" returns the position at which the Actor was last rendered. Since \ref Dali::Actor::SetPosition "Dali::Actor::SetPosition" is asynchronous, a call to \ref Dali::Actor::Property::POSITION "Dali::Actor::Property::POSITION" won't immediately return the same value. @code // Whilst handling an event... @@ -26,14 +26,14 @@ Stage::GetCurrent().Add(actor); // initial position is 0,0,0 actor.SetPosition(Vector3(10,10,10)); Vector3 current; -current = actor.GetCurrentPosition(); +current = actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); std::cout << "Current position: " << current.x << ", " << current.y << ", " << current.z << std::endl; std::cout << "..." << std::endl; // Whilst handling another event... -current = actor.GetCurrentPosition(); +current = actor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ); std::cout << "Current position: " << current.x << ", " << current.y << ", " << current.z << std::endl; @endcode diff --git a/docs/content/programming-guide/event-system.h b/docs/content/programming-guide/event-system.h index 98c650d..9e0c1b2 100644 --- a/docs/content/programming-guide/event-system.h +++ b/docs/content/programming-guide/event-system.h @@ -72,7 +72,7 @@ The example below shows how an application can be notified of a pinch gesture: void OnPinch( Dali::Actor actor, const Dali::PinchGesture& pinch ) { // Scale your actor according to the pinch scale - Vector3 newSize = actor.GetCurrentSize() * pinch.scale; + Vector3 newSize = actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ) * pinch.scale; actor.SetSize(newSize); } diff --git a/docs/content/programming-guide/flex-container.md b/docs/content/programming-guide/flex-container.md index ab0e392..4552527 100644 --- a/docs/content/programming-guide/flex-container.md +++ b/docs/content/programming-guide/flex-container.md @@ -335,7 +335,7 @@ Firstly, we create a flex container as the whole view and set its resize policy // Create the main flex container Dali::Toolkit::FlexContainer flexContainer = Dali::Toolkit::FlexContainer::New(); flexContainer.SetParentOrigin( Dali::ParentOrigin::TOP_LEFT ); -flexContainer.SetAnchorPoint( Dali::AnchorPoint::TOP_LEFT ); +flexContainer.SetProperty( Dali::Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::TOP_LEFT ); flexContainer.SetResizePolicy( Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::ALL_DIMENSIONS ); flexContainer.SetBackgroundColor( Dali::Color::WHITE ); // set the background color to be white @@ -361,7 +361,7 @@ Now we create a flex container as the toolbar and add it to the main container. // Create the toolbar Dali::Toolkit::FlexContainer toolBar = Dali::Toolkit::FlexContainer::New(); toolBar.SetParentOrigin( Dali::ParentOrigin::TOP_LEFT ); -toolBar.SetAnchorPoint( Dali::AnchorPoint::TOP_LEFT ); +toolBar.SetProperty( Dali::Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::TOP_LEFT ); toolBar.SetBackgroundColor( Dali::Color::CYAN ); // Set the background color for the toolbar // Add it to the main container @@ -389,7 +389,7 @@ We want the item inside it to be horizontally and vertically centered, so that t // Create the content area Dali::Toolkit::FlexContainer content = Dali::Toolkit::FlexContainer::New(); content.SetParentOrigin( Dali::ParentOrigin::TOP_LEFT ); -content.SetAnchorPoint( Dali::AnchorPoint::TOP_LEFT ); +content.SetProperty( Dali::Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::TOP_LEFT ); content.SetProperty( Dali::Toolkit::FlexContainer::Property::FLEX_DIRECTION, Dali::Toolkit::FlexContainer::ROW ); // display items horizontally content.SetProperty( Dali::Toolkit::FlexContainer::Property::JUSTIFY_CONTENT, Dali::Toolkit::FlexContainer::JUSTIFY_CENTER ); // align items horizontally center content.SetProperty( Dali::Toolkit::FlexContainer::Property::ALIGN_ITEMS, Dali::Toolkit::FlexContainer::ALIGN_CENTER ); // align items vertically center @@ -409,8 +409,8 @@ We will also add some space around the items so that the layout looks nicer. // Add a button to the left of the toolbar Dali::Toolkit::PushButton prevButton = Dali::Toolkit::PushButton::New(); prevButton.SetParentOrigin( Dali::ParentOrigin::TOP_LEFT ); -prevButton.SetAnchorPoint( Dali::AnchorPoint::TOP_LEFT ); -prevButton.SetMinimumSize( Dali::Vector2( 100.0f, 60.0f ) ); // this is the minimum size the button should keep +prevButton.SetProperty( Dali::Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::TOP_LEFT ); +prevButton.SetProperty( Dali::Actor::Property::MINIMUM_SIZE, Dali::Vector2( 100.0f, 60.0f ) ); // this is the minimum size the button should keep prevButton.SetProperty( Dali::Toolkit::FlexContainer::ChildProperty::FLEX_MARGIN, Dali::Vector4(10.0f, 10.0f, 10.0f, 10.0f) ); // set 10 pixel margin around the button toolBar.Add( prevButton ); @@ -423,7 +423,7 @@ prevButton.SetProperty( Dali::Toolkit::Button::Property::LABEL, labelMap ); // Add a title to the center of the toolbar Dali::Toolkit::TextLabel title = Dali::Toolkit::TextLabel::New( "Gallery" ); title.SetParentOrigin( Dali::ParentOrigin::TOP_LEFT ); -title.SetAnchorPoint( Dali::AnchorPoint::TOP_LEFT ); +title.SetProperty( Dali::Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::TOP_LEFT ); title.SetResizePolicy( Dali::ResizePolicy::USE_NATURAL_SIZE, Dali::Dimension::ALL_DIMENSIONS ); title.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); title.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); @@ -434,8 +434,8 @@ toolBar.Add( title ); // Add a button to the right of the toolbar Dali::Toolkit::PushButton nextButton = Dali::Toolkit::PushButton::New(); nextButton.SetParentOrigin( Dali::ParentOrigin::TOP_LEFT ); -nextButton.SetAnchorPoint( Dali::AnchorPoint::TOP_LEFT ); -nextButton.SetMinimumSize( Dali::Vector2( 100.0f, 60.0f ) ); // this is the minimum size the button should keep +nextButton.SetProperty( Dali::Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::TOP_LEFT ); +nextButton.SetProperty( Dali::Actor::Property::MINIMUM_SIZE, Dali::Vector2( 100.0f, 60.0f ) ); // this is the minimum size the button should keep nextButton.SetProperty( Dali::Toolkit::FlexContainer::ChildProperty::FLEX_MARGIN, Dali::Vector4(10.0f, 10.0f, 10.0f, 10.0f) ); // set 10 pixel margin around the button toolBar.Add( nextButton ); @@ -454,7 +454,7 @@ Finally, we will add the image to the content area. // Add an image to the center of the content area Dali::Toolkit::ImageView imageView = Dali::Toolkit::ImageView::New( "image.jpg" ); imageView.SetParentOrigin( Dali::ParentOrigin::TOP_LEFT ); -imageView.SetAnchorPoint( Dali::AnchorPoint::TOP_LEFT ); +imageView.SetProperty( Dali::Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::TOP_LEFT ); content.Add( imageView ); ~~~ diff --git a/docs/content/programming-guide/hello-world.h b/docs/content/programming-guide/hello-world.h index 780ad3e..aa37687 100644 --- a/docs/content/programming-guide/hello-world.h +++ b/docs/content/programming-guide/hello-world.h @@ -44,7 +44,7 @@ public: Stage stage = Stage::GetCurrent(); mTextLabel = TextLabel::New( "Hello World" ); - mTextLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + mTextLabel.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); stage.Add( mTextLabel ); // Respond to a click anywhere on the stage diff --git a/docs/content/programming-guide/item-view.md b/docs/content/programming-guide/item-view.md index 0242d19..fa71fd7 100644 --- a/docs/content/programming-guide/item-view.md +++ b/docs/content/programming-guide/item-view.md @@ -49,7 +49,7 @@ These overridden methods in our factory will be called by the Item View. MyFactory factory; // Should store this as a member variable Dali::Toolkit::ItemView itemView = Dali::Toolkit::ItemView::New( factory ); // Pass in our factory itemView.SetParentOrigin( ParentOrigin::CENTER ); -itemView.SetAnchorPoint( AnchorPoint::CENTER ); +itemView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); // Now create a layout Dali::Toolkit::ItemLayoutPtr spiralLayout = Dali::Toolkit::DefaultItemLayout::New( Dali::Toolkit::DefaultItemLayout::SPIRAL ); diff --git a/docs/content/programming-guide/layer.md b/docs/content/programming-guide/layer.md index a9627d5..188654f 100644 --- a/docs/content/programming-guide/layer.md +++ b/docs/content/programming-guide/layer.md @@ -43,7 +43,7 @@ Clips the contents of the layer to a rectangle. ~~~{.cpp} // C++ -layer1.SetAnchorPoint( AnchorPoint::CENTER ); +layer1.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); layer1.SetParentOrigin( ParentOrigin::CENTER ); layer1.SetClipping( true ); layer1.SetClippingBox( 20, 20, 100, 100 ); // X, Y, Width, Height diff --git a/docs/content/programming-guide/multi-touch-guide.md b/docs/content/programming-guide/multi-touch-guide.md index dd583b7..c31c495 100644 --- a/docs/content/programming-guide/multi-touch-guide.md +++ b/docs/content/programming-guide/multi-touch-guide.md @@ -12,10 +12,10 @@ For C++ API see Dali::Actor::TouchSignal() and Dali::Actor::HoveredSignal() for - An actor is only hittable if the actor's touch signal has a connection. - An actor is only hittable when it is between the camera's near and far planes. - - If an actor is made insensitive, then the actor and its children are not hittable; see Dali::Actor::IsSensitive() - - If an actor's visibility flag is unset, then none of its children are hittable either; see Dali::Actor::IsVisible() + - If an actor is made insensitive, then the actor and its children are not hittable; see Dali::Actor:.Property::SENSITIVE + - If an actor's visibility flag is unset, then none of its children are hittable either; see Dali::Actor::Property::VISIBLE - To be hittable, an actor must have a non-zero size. - - If an actor's world color is fully transparent, then it is not hittable; see GetCurrentWorldColor() + - If an actor's world color is fully transparent, then it is not hittable; see Dali::Actor::Property::WORLD_COLOR ### Hit Test Algorithm: diff --git a/docs/content/programming-guide/popup.md b/docs/content/programming-guide/popup.md index 4ea5dd2..901d0d6 100644 --- a/docs/content/programming-guide/popup.md +++ b/docs/content/programming-guide/popup.md @@ -241,13 +241,13 @@ ImageView footer = ImageView::New( DEFAULT_CONTROL_AREA_IMAGE_PATH ); footer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); footer.SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT ); footer.SetSize( 0.0f, 80.0f ); -footer.SetAnchorPoint( AnchorPoint::CENTER ); +footer.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); footer.SetParentOrigin( ParentOrigin::CENTER ); Toolkit::PushButton okButton = Toolkit::PushButton::New(); okButton.SetLabelText( "OK" ); okButton.SetParentOrigin( ParentOrigin::CENTER ); -okButton.SetAnchorPoint( AnchorPoint::CENTER ); +okButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); okButton.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS ); okButton.SetSizeModeFactor( Vector3( -20.0f, -20.0f, 0.0 ) ); okButton.ClickedSignal().Connect( this, &MyExample::OnOKButtonClicked ); @@ -255,7 +255,7 @@ okButton.ClickedSignal().Connect( this, &MyExample::OnOKButtonClicked ); Toolkit::PushButton cancelButton = Toolkit::PushButton::New(); cancelButton.SetLabelText( "Cancel" ); cancelButton.SetParentOrigin( ParentOrigin::CENTER ); -cancelButton.SetAnchorPoint( AnchorPoint::CENTER ); +cancelButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); cancelButton.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS ); cancelButton.SetSizeModeFactor( Vector3( -20.0f, -20.0f, 0.0 ) ); cancelButton.ClickedSignal().Connect( this, &MyExample::OnCancelButtonClicked ); @@ -263,7 +263,7 @@ cancelButton.ClickedSignal().Connect( this, &MyExample::OnCancelButtonClicked ); // Set up the footer's layout. Toolkit::TableView controlLayout = Toolkit::TableView::New( 1, 2 ); controlLayout.SetParentOrigin( ParentOrigin::CENTER ); -controlLayout.SetAnchorPoint( AnchorPoint::CENTER ); +controlLayout.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); controlLayout.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); controlLayout.SetCellPadding( Size( 10.0f, 10.0f ) ); controlLayout.SetRelativeWidth( 0, 0.5f ); diff --git a/docs/content/programming-guide/programming-languages.md b/docs/content/programming-guide/programming-languages.md index ea391b2..a17705c 100644 --- a/docs/content/programming-guide/programming-languages.md +++ b/docs/content/programming-guide/programming-languages.md @@ -10,7 +10,7 @@ DALi applications can be written in several different programming languages. ~~~{.cpp} Dali::Actor actor = Dali::Actor::New(); actor.SetParentOrigin( Dali::ParentOrigin::CENTER ); -actor.SetAnchorPoint( Dali::AnchorPoint::CENTER ); +actor.SetProperty( Dali::Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::CENTER ); Dali::Stage::GetCurrent().Add( actor ); ... bool OnPressed( Dali::Actor, const TouchData& touch ) diff --git a/docs/content/programming-guide/size-negotiation.h b/docs/content/programming-guide/size-negotiation.h index 9605573..0687233 100644 --- a/docs/content/programming-guide/size-negotiation.h +++ b/docs/content/programming-guide/size-negotiation.h @@ -99,8 +99,8 @@ If only one dimension is FIXED then the other value in the size parameter will b To constrain the final negotiated size of an actor, set the following for minimum and maximum sizes respectively. @code -void SetMinimumSize( const Vector2& size ) -void SetMaximumSize( const Vector2& size ) +actor.SetProperty( Actor::Property::MINIMUM_SIZE, minSize ); +actor.SetProperty( Actor::Property::MAXIMUM_SIZE, maxSize ); @endcode

Altering Negotiated Size

diff --git a/docs/content/programming-guide/text-label.md b/docs/content/programming-guide/text-label.md index 4629482..e893957 100644 --- a/docs/content/programming-guide/text-label.md +++ b/docs/content/programming-guide/text-label.md @@ -19,7 +19,7 @@ Note *CR+LF* new line characters are replaced by a *LF* one. TextLabel label = TextLabel::New(); label.SetProperty( TextLabel::Property::TEXT, "Hello World" ); -label.SetAnchorPoint( AnchorPoint::TOP_LEFT ); +label.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( label ); ~~~ @@ -115,7 +115,7 @@ Therefore in this example the same result would be displayed, regardless of the // C++ TextLabel label = TextLabel::New( "Hello World" ); -label.SetAnchorPoint( AnchorPoint::TOP_LEFT ); +label.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); label.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); label.SetBackgroundColor( Color::BLUE ); Stage::GetCurrent().Add( label ); @@ -136,11 +136,11 @@ Here is an example of this behavior using TableView as the parent: TableView parent = TableView::New( 3, 1 ); parent.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); parent.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); -parent.SetAnchorPoint( AnchorPoint::TOP_LEFT ); +parent.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); Stage::GetCurrent().Add( parent ); TextLabel label = TextLabel::New( "Hello World" ); -label.SetAnchorPoint( AnchorPoint::TOP_LEFT ); +label.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); label.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); label.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); label.SetBackgroundColor( Color::BLUE ); @@ -148,7 +148,7 @@ parent.AddChild( label, TableView::CellPosition( 0, 0 ) ); parent.SetFitHeight( 0 ); label = TextLabel::New( "A Quick Brown Fox Jumps Over The Lazy Dog" ); -label.SetAnchorPoint( AnchorPoint::TOP_LEFT ); +label.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); label.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); label.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); label.SetBackgroundColor( Color::GREEN ); @@ -157,7 +157,7 @@ parent.AddChild( label, TableView::CellPosition( 1, 0 ) ); parent.SetFitHeight( 1 ); label = TextLabel::New( "لإعادة ترتيب الشاشات، يجب تغيير نوع العرض إلى شبكة قابلة للتخصيص." ); -label.SetAnchorPoint( AnchorPoint::TOP_LEFT ); +label.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); label.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); label.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); label.SetBackgroundColor( Color::BLUE ); -- 2.7.4 From e3ea0f7d81bc3cac90c63b85bd41ab764aa1105e Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Tue, 26 May 2020 18:08:28 +0900 Subject: [PATCH 11/16] DALi Version 1.5.13 Change-Id: I7cca1dc738a3e6af5df5c5fff99335c548fdd5ab --- dali-toolkit/public-api/dali-toolkit-version.cpp | 2 +- packaging/dali-toolkit.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index 09aa72d..63e2cfb 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -31,7 +31,7 @@ namespace Toolkit const unsigned int TOOLKIT_MAJOR_VERSION = 1; const unsigned int TOOLKIT_MINOR_VERSION = 5; -const unsigned int TOOLKIT_MICRO_VERSION = 12; +const unsigned int TOOLKIT_MICRO_VERSION = 13; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 7d2896f..090351c 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali-toolkit Summary: Dali 3D engine Toolkit -Version: 1.5.12 +Version: 1.5.13 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT -- 2.7.4 From aabdbc50a8657c9a8e1a25ac5ab64471cb3fd982 Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Thu, 21 May 2020 14:38:12 +0900 Subject: [PATCH 12/16] Even if ELLIPSIS is set to false and ENABLE_AUTO_SCROLL is set to true, Ellipsis is alaways set to true when scrolling is finished. Do not change user settings. textLabel.SetProperty(TextLabel::Property::ELLIPSIS, false); textLabel.SetProperty(TextLabel::Property::ENABLE_AUTO_SCROLL, true); Change-Id: I98703d5c25237901812af568a1f2ca4c6c143889 --- .../src/dali-toolkit/utc-Dali-TextLabel.cpp | 45 ++++++++++++++++++++++ .../controls/text-controls/text-label-impl.cpp | 3 +- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp index 2d6b092..bdd22fd 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp @@ -1105,6 +1105,51 @@ int UtcDaliToolkitTextlabelScrollingN(void) END_TEST; } +int UtcDaliToolkitTextlabelScrollingWithEllipsis(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliToolkitTextlabelScrollingWithEllipsis"); + + TextLabel label = TextLabel::New("Some text to scroll"); + DALI_TEST_CHECK( label ); + + Stage::GetCurrent().Add( label ); + + // Avoid a crash when core load gl resources. + application.GetGlAbstraction().SetCheckFramebufferStatusResult( GL_FRAMEBUFFER_COMPLETE ); + + // Turn on all the effects. + label.SetProperty( TextLabel::Property::AUTO_SCROLL_GAP, 50.0f ); + label.SetProperty( TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3 ); + label.SetProperty( TextLabel::Property::AUTO_SCROLL_SPEED, 80.0f ); + + try + { + // Enable the auto scrolling effect. + label.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, true ); + label.SetProperty( TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE ); + + // Disable the ellipsis + label.SetProperty( TextLabel::Property::ELLIPSIS, false ); + + // Render the text. + application.SendNotification(); + application.Render(); + + // Stop auto scrolling + label.SetProperty( TextLabel::Property::ENABLE_AUTO_SCROLL, false ); + + // Check the ellipsis property + DALI_TEST_CHECK( !label.GetProperty( TextLabel::Property::ELLIPSIS ) ); + } + catch( ... ) + { + tet_result(TET_FAIL); + } + + END_TEST; +} + int UtcDaliToolkitTextlabelEllipsis(void) { ToolkitTestApplication application; diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp index 2fddac3..e542d9c 100755 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp @@ -1076,6 +1076,7 @@ void TextLabel::SetUpAutoScrolling() const int maxTextureSize = Dali::GetMaxTextureSize(); //if the texture size width exceed maxTextureSize, modify the visual model size and enabled the ellipsis + bool actualellipsis = mController->IsTextElideEnabled(); if( verifiedSize.width > maxTextureSize ) { verifiedSize.width = maxTextureSize; @@ -1108,6 +1109,7 @@ void TextLabel::SetUpAutoScrolling() // Set parameters for scrolling Renderer renderer = static_cast( GetImplementation( mVisual ) ).GetRenderer(); mTextScroller->SetParameters( Self(), renderer, textureSet, controlSize, verifiedSize, wrapGap, direction, mController->GetHorizontalAlignment(), mController->GetVerticalAlignment() ); + mController->SetTextElideEnabled( actualellipsis ); } void TextLabel::ScrollingFinished() @@ -1115,7 +1117,6 @@ void TextLabel::ScrollingFinished() // Pure Virtual from TextScroller Interface DALI_LOG_INFO( gLogFilter, Debug::General, "TextLabel::ScrollingFinished\n"); mController->SetAutoScrollEnabled( false ); - mController->SetTextElideEnabled( true ); RequestTextRelayout(); } -- 2.7.4 From bda827587785665fa25af9510df0fded93ff95bd Mon Sep 17 00:00:00 2001 From: "Seungho, Baek" Date: Wed, 20 May 2020 17:50:54 +0900 Subject: [PATCH 13/16] Recreate resources after blur is deactivated. - Currently, each resources are created only the size is changed. - But, if the Blur is deactivated, the resources are reset and we need to create each resource again when the blur is re-activated. Change-Id: Ie8eab91e571439d6db74b6f39f43e0016a277416 Signed-off-by: Seungho, Baek --- .../src/dali-toolkit/utc-Dali-GaussianBlurView.cpp | 42 +++++- .../gaussian-blur-view/gaussian-blur-view-impl.cpp | 156 +++++++++++---------- 2 files changed, 120 insertions(+), 78 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp index 0a483a0..170a17c 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 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. @@ -190,6 +190,46 @@ int UtcDaliGaussianBlurActivateDeactivate(void) } // Positive test case for a method +int UtcDaliGaussianBlurActivateDeactivateRepeat(void) +{ + ToolkitTestApplication application; + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + tet_infoline("UtcDaliGaussianBlurActivateDeactivateRepeat"); + + Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New(); + DALI_TEST_CHECK( view ); + + view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + view.SetSize(Stage::GetCurrent().GetSize()); + view.Add(Actor::New()); + Stage::GetCurrent().Add(view); + view.Activate(); + + application.SendNotification(); + application.Render(20); + + DALI_TEST_CHECK( gl.GetLastGenTextureId() == 3 ); + + view.Deactivate(); + + application.SendNotification(); + application.Render(20); + + DALI_TEST_CHECK( gl.GetLastGenTextureId() == 3 ); + + view.Activate(); + + application.SendNotification(); + application.Render(20); + + DALI_TEST_CHECK( gl.GetLastGenTextureId() == 6 ); + + END_TEST; +} + +// Positive test case for a method int UtcDaliGaussianBlurViewSetGetBackgroundColor(void) { ToolkitTestApplication application; diff --git a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp index 62aca10..1b47c68 100644 --- a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp +++ b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-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. @@ -386,72 +386,68 @@ void GaussianBlurView::OnChildRemove( Actor& child ) void GaussianBlurView::AllocateResources() { - // size of render targets etc is based on the size of this actor, ignoring z - if(mTargetSize != mLastSize) - { - mLastSize = mTargetSize; + mLastSize = mTargetSize; + + // get size of downsampled render targets + mDownsampledWidth = mTargetSize.width * mDownsampleWidthScale; + mDownsampledHeight = mTargetSize.height * mDownsampleHeightScale; + + // Create and place a camera for the renders corresponding to the (potentially downsampled) render targets' size + mRenderDownsampledCamera.SetFieldOfView(ARBITRARY_FIELD_OF_VIEW); + // TODO: how do we pick a reasonable value for near clip? Needs to relate to normal camera the user renders with, but we don't have a handle on it + mRenderDownsampledCamera.SetNearClippingPlane(1.0f); + mRenderDownsampledCamera.SetAspectRatio(mDownsampledWidth / mDownsampledHeight); + mRenderDownsampledCamera.SetType(Dali::Camera::FREE_LOOK); // camera orientation based solely on actor - // get size of downsampled render targets - mDownsampledWidth = mTargetSize.width * mDownsampleWidthScale; - mDownsampledHeight = mTargetSize.height * mDownsampleHeightScale; + mRenderDownsampledCamera.SetPosition(0.0f, 0.0f, ((mDownsampledHeight * 0.5f) / tanf(ARBITRARY_FIELD_OF_VIEW * 0.5f))); - // Create and place a camera for the renders corresponding to the (potentially downsampled) render targets' size - mRenderDownsampledCamera.SetFieldOfView(ARBITRARY_FIELD_OF_VIEW); + // setup for normal operation + if(!mBlurUserImage) + { + // Create and place a camera for the children render, corresponding to its render target size + mRenderFullSizeCamera.SetFieldOfView(ARBITRARY_FIELD_OF_VIEW); // TODO: how do we pick a reasonable value for near clip? Needs to relate to normal camera the user renders with, but we don't have a handle on it - mRenderDownsampledCamera.SetNearClippingPlane(1.0f); - mRenderDownsampledCamera.SetAspectRatio(mDownsampledWidth / mDownsampledHeight); - mRenderDownsampledCamera.SetType(Dali::Camera::FREE_LOOK); // camera orientation based solely on actor - - mRenderDownsampledCamera.SetPosition(0.0f, 0.0f, ((mDownsampledHeight * 0.5f) / tanf(ARBITRARY_FIELD_OF_VIEW * 0.5f))); - - // setup for normal operation - if(!mBlurUserImage) - { - // Create and place a camera for the children render, corresponding to its render target size - mRenderFullSizeCamera.SetFieldOfView(ARBITRARY_FIELD_OF_VIEW); - // TODO: how do we pick a reasonable value for near clip? Needs to relate to normal camera the user renders with, but we don't have a handle on it - mRenderFullSizeCamera.SetNearClippingPlane(1.0f); - mRenderFullSizeCamera.SetAspectRatio(mTargetSize.width / mTargetSize.height); - mRenderFullSizeCamera.SetType(Dali::Camera::FREE_LOOK); // camera orientation based solely on actor - - float cameraPosConstraintScale = 0.5f / tanf(ARBITRARY_FIELD_OF_VIEW * 0.5f); - mRenderFullSizeCamera.SetPosition(0.0f, 0.0f, mTargetSize.height * cameraPosConstraintScale); - - // create offscreen buffer of new size to render our child actors to - mRenderTargetForRenderingChildren = FrameBuffer::New( mTargetSize.width, mTargetSize.height, FrameBuffer::Attachment::NONE ); - Texture texture = Texture::New( TextureType::TEXTURE_2D, mPixelFormat, unsigned(mTargetSize.width), unsigned(mTargetSize.height) ); - mRenderTargetForRenderingChildren.AttachColorTexture( texture ); - - // Set actor for performing a horizontal blur - SetRendererTexture( mHorizBlurActor.GetRendererAt(0), mRenderTargetForRenderingChildren ); - - // Create offscreen buffer for vert blur pass - mRenderTarget1 = FrameBuffer::New( mDownsampledWidth, mDownsampledHeight, FrameBuffer::Attachment::NONE ); - texture = Texture::New(TextureType::TEXTURE_2D, mPixelFormat, unsigned(mDownsampledWidth), unsigned(mDownsampledHeight)); - mRenderTarget1.AttachColorTexture( texture ); - - // use the completed blur in the first buffer and composite with the original child actors render - SetRendererTexture( mCompositingActor.GetRendererAt(0), mRenderTarget1 ); - - // set up target actor for rendering result, i.e. the blurred image - SetRendererTexture( mTargetActor.GetRendererAt(0), mRenderTargetForRenderingChildren ); - } - - // Create offscreen buffer for horiz blur pass - mRenderTarget2 = FrameBuffer::New( mDownsampledWidth, mDownsampledHeight, FrameBuffer::Attachment::NONE ); - Texture texture = Texture::New(TextureType::TEXTURE_2D, mPixelFormat, unsigned(mDownsampledWidth), unsigned(mDownsampledHeight)); - mRenderTarget2.AttachColorTexture( texture ); - - // size needs to match render target - mHorizBlurActor.SetSize(mDownsampledWidth, mDownsampledHeight); - - // size needs to match render target - mVertBlurActor.SetSize(mDownsampledWidth, mDownsampledHeight); - SetRendererTexture( mVertBlurActor.GetRendererAt(0), mRenderTarget2 ); - - // set gaussian blur up for new sized render targets - SetShaderConstants(); + mRenderFullSizeCamera.SetNearClippingPlane(1.0f); + mRenderFullSizeCamera.SetAspectRatio(mTargetSize.width / mTargetSize.height); + mRenderFullSizeCamera.SetType(Dali::Camera::FREE_LOOK); // camera orientation based solely on actor + + float cameraPosConstraintScale = 0.5f / tanf(ARBITRARY_FIELD_OF_VIEW * 0.5f); + mRenderFullSizeCamera.SetPosition(0.0f, 0.0f, mTargetSize.height * cameraPosConstraintScale); + + // create offscreen buffer of new size to render our child actors to + mRenderTargetForRenderingChildren = FrameBuffer::New( mTargetSize.width, mTargetSize.height, FrameBuffer::Attachment::NONE ); + Texture texture = Texture::New( TextureType::TEXTURE_2D, mPixelFormat, unsigned(mTargetSize.width), unsigned(mTargetSize.height) ); + mRenderTargetForRenderingChildren.AttachColorTexture( texture ); + + // Set actor for performing a horizontal blur + SetRendererTexture( mHorizBlurActor.GetRendererAt(0), mRenderTargetForRenderingChildren ); + + // Create offscreen buffer for vert blur pass + mRenderTarget1 = FrameBuffer::New( mDownsampledWidth, mDownsampledHeight, FrameBuffer::Attachment::NONE ); + texture = Texture::New(TextureType::TEXTURE_2D, mPixelFormat, unsigned(mDownsampledWidth), unsigned(mDownsampledHeight)); + mRenderTarget1.AttachColorTexture( texture ); + + // use the completed blur in the first buffer and composite with the original child actors render + SetRendererTexture( mCompositingActor.GetRendererAt(0), mRenderTarget1 ); + + // set up target actor for rendering result, i.e. the blurred image + SetRendererTexture( mTargetActor.GetRendererAt(0), mRenderTargetForRenderingChildren ); } + + // Create offscreen buffer for horiz blur pass + mRenderTarget2 = FrameBuffer::New( mDownsampledWidth, mDownsampledHeight, FrameBuffer::Attachment::NONE ); + Texture texture = Texture::New(TextureType::TEXTURE_2D, mPixelFormat, unsigned(mDownsampledWidth), unsigned(mDownsampledHeight)); + mRenderTarget2.AttachColorTexture( texture ); + + // size needs to match render target + mHorizBlurActor.SetSize(mDownsampledWidth, mDownsampledHeight); + + // size needs to match render target + mVertBlurActor.SetSize(mDownsampledWidth, mDownsampledHeight); + SetRendererTexture( mVertBlurActor.GetRendererAt(0), mRenderTarget2 ); + + // set gaussian blur up for new sized render targets + SetShaderConstants(); } void GaussianBlurView::CreateRenderTasks() @@ -533,11 +529,14 @@ void GaussianBlurView::RemoveRenderTasks() void GaussianBlurView::Activate() { - // make sure resources are allocated and start the render tasks processing - Self().Add( mInternalRoot ); - AllocateResources(); - CreateRenderTasks(); - mActivated = true; + if( !mActivated ) + { + // make sure resources are allocated and start the render tasks processing + Self().Add( mInternalRoot ); + AllocateResources(); + CreateRenderTasks(); + mActivated = true; + } } void GaussianBlurView::ActivateOnce() @@ -549,15 +548,18 @@ void GaussianBlurView::ActivateOnce() void GaussianBlurView::Deactivate() { - // stop render tasks processing - // Note: render target resources are automatically freed since we set the Image::Unused flag - mInternalRoot.Unparent(); - RemoveRenderTasks(); - mRenderTargetForRenderingChildren.Reset(); - mRenderTarget1.Reset(); - mRenderTarget2.Reset(); - mRenderOnce = false; - mActivated = false; + if( mActivated ) + { + // stop render tasks processing + // Note: render target resources are automatically freed since we set the Image::Unused flag + mInternalRoot.Unparent(); + mRenderTargetForRenderingChildren.Reset(); + mRenderTarget1.Reset(); + mRenderTarget2.Reset(); + RemoveRenderTasks(); + mRenderOnce = false; + mActivated = false; + } } void GaussianBlurView::SetBlurBellCurveWidth(float blurBellCurveWidth) -- 2.7.4 From 291169129417e5717cfcbdb644ddeb24b18270c8 Mon Sep 17 00:00:00 2001 From: "Seungho, Baek" Date: Thu, 21 May 2020 15:03:02 +0900 Subject: [PATCH 14/16] To use ActivateOnce to blur child views Change-Id: Idf5997e7b9e06a617752bd31ea0f6dcd6cee34e8 Signed-off-by: Seungho, Baek --- .../src/dali-toolkit/utc-Dali-GaussianBlurView.cpp | 37 ++++++++++++++++++++-- .../gaussian-blur-view/gaussian-blur-view.h | 3 +- .../gaussian-blur-view/gaussian-blur-view-impl.cpp | 16 ++++++++-- 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp index 170a17c..afc6aee 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp @@ -269,10 +269,10 @@ int UtcDaliGaussianBlurViewSetGetRenderTarget(void) END_TEST; } -int UtcDaliGaussianBlurViewActivateOnce(void) +int UtcDaliGaussianBlurViewActivateOnce1(void) { ToolkitTestApplication application; - tet_infoline("UtcDaliGaussianBlurActivateOnce"); + tet_infoline("UtcDaliGaussianBlurActivateOnce1"); Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New(5, 1.5f, Pixel::RGB888, 0.5f, 0.5f, true); DALI_TEST_CHECK( view ); @@ -293,6 +293,39 @@ int UtcDaliGaussianBlurViewActivateOnce(void) END_TEST; } +// Positive test case for a method +int UtcDaliGaussianBlurActivateOnce2(void) +{ + ToolkitTestApplication application; + TestGlAbstraction& gl = application.GetGlAbstraction(); + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + tet_infoline("UtcDaliGaussianBlurActivateOnce2"); + + Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New(); + DALI_TEST_CHECK( view ); + + view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + view.SetSize(Stage::GetCurrent().GetSize()); + view.Add(Actor::New()); + Stage::GetCurrent().Add(view); + view.ActivateOnce(); + + application.SendNotification(); + application.Render(20); + + DALI_TEST_CHECK( gl.GetLastGenTextureId() == 3 ); + + view.ActivateOnce(); + + application.SendNotification(); + application.Render(20); + + DALI_TEST_CHECK( gl.GetLastGenTextureId() == 6 ); + + END_TEST; +} + int UtcDaliGaussianBlurViewFinishedSignalN(void) { ToolkitTestApplication application; diff --git a/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h index 9b7824c..49b0205 100644 --- a/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h +++ b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_GAUSSIAN_BLUR_EFFECT_H /* - * Copyright (c) 2019 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. @@ -226,7 +226,6 @@ public: * @brief Render the GaussianBlurView once. * * Must be called after you Add() it to the stage. - * Only works with a gaussian blur view created with blurUserImage = true. * Listen to the Finished signal to determine when the rendering has completed. * @SINCE_1_0.0 */ diff --git a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp index 1b47c68..c4d744e 100644 --- a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp +++ b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp @@ -466,6 +466,11 @@ void GaussianBlurView::CreateRenderTasks() mRenderChildrenTask.SetCameraActor(mRenderFullSizeCamera); mRenderChildrenTask.SetFrameBuffer( mRenderTargetForRenderingChildren ); + + if( mRenderOnce ) + { + mRenderChildrenTask.SetRefreshRate(RenderTask::REFRESH_ONCE); + } } // perform a horizontal blur targeting the second buffer @@ -477,7 +482,7 @@ void GaussianBlurView::CreateRenderTasks() mHorizBlurTask.SetClearColor( mBackgroundColor ); mHorizBlurTask.SetCameraActor(mRenderDownsampledCamera); mHorizBlurTask.SetFrameBuffer( mRenderTarget2 ); - if( mRenderOnce && mBlurUserImage ) + if( mRenderOnce || ( mRenderOnce && mBlurUserImage ) ) { mHorizBlurTask.SetRefreshRate(RenderTask::REFRESH_ONCE); } @@ -498,7 +503,7 @@ void GaussianBlurView::CreateRenderTasks() { mVertBlurTask.SetFrameBuffer( mRenderTarget1 ); } - if( mRenderOnce && mBlurUserImage ) + if( mRenderOnce || ( mRenderOnce && mBlurUserImage ) ) { mVertBlurTask.SetRefreshRate(RenderTask::REFRESH_ONCE); mVertBlurTask.FinishedSignal().Connect( this, &GaussianBlurView::OnRenderTaskFinished ); @@ -514,6 +519,11 @@ void GaussianBlurView::CreateRenderTasks() mCompositeTask.SetCameraActor(mRenderFullSizeCamera); mCompositeTask.SetFrameBuffer( mRenderTargetForRenderingChildren ); + + if( mRenderOnce ) + { + mCompositeTask.SetRefreshRate(RenderTask::REFRESH_ONCE); + } } } @@ -541,7 +551,7 @@ void GaussianBlurView::Activate() void GaussianBlurView::ActivateOnce() { - DALI_ASSERT_ALWAYS(mBlurUserImage); // Only works with blurring image mode. + Deactivate(); mRenderOnce = true; Activate(); } -- 2.7.4 From e6d1e3f6561f4eac7a5709c44135d53f65072c5d Mon Sep 17 00:00:00 2001 From: Sunghyun Kim Date: Fri, 21 Feb 2020 14:10:38 +0900 Subject: [PATCH 15/16] Add FittingMode for image Add fittingMode for image. - CENTER : Image fills inside using original width & height. - FILL : Image filles whole width & height. this fitting mode don't maintain aspect ratio. Change-Id: Ia0b54a867a867d547e430384b17eb5e65593ce61 --- .../src/dali-toolkit/utc-Dali-ImageView.cpp | 705 ++++++++++++++++++++- .../src/dali-toolkit/utc-Dali-Visual.cpp | 2 +- build/tizen/docs-internal/dali-internal.doxy.in | 2 + .../devel-api/visuals/visual-properties-devel.h | 8 +- .../controls/image-view/image-view-impl.cpp | 189 ++++-- .../internal/controls/image-view/image-view-impl.h | 21 + .../internal/visuals/image/image-visual.cpp | 4 +- .../internal/visuals/texture-manager-impl.h | 2 +- dali-toolkit/internal/visuals/visual-base-impl.cpp | 4 + 9 files changed, 880 insertions(+), 57 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp index d733a8c..9e811c8 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp @@ -94,6 +94,8 @@ static const char* gImage_600_RGB = TEST_RESOURCE_DIR "/test-image-600.jpg"; // resolution: 50*50, frame count: 4, frame delay: 0.2 second for each frame const char* TEST_GIF_FILE_NAME = TEST_RESOURCE_DIR "/anim.gif"; +const char* TEST_VECTOR_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/insta_camera.json"; + void TestImage( ImageView imageView, BufferImage image ) { Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) ); @@ -2120,7 +2122,6 @@ int UtcDaliImageViewFillMode(void) ToolkitTestApplication application; tet_infoline( "Create an ImageVisual without padding and set the fill-mode to fill" ); - tet_infoline( " There should be no need to change the transform, our size-policy should be relative and size should be [1,1]"); ImageView imageView = ImageView::New(); Property::Map imageMap; @@ -2145,18 +2146,718 @@ int UtcDaliImageViewFillMode(void) Property::Map* map = value->GetMap(); DALI_TEST_CHECK( map ); + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2::ONE, TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get< int >() == Toolkit::Visual::Transform::Policy::RELATIVE ); + + END_TEST; +} + +int UtcDaliImageViewFittingModeFitKeepAspectRatio(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using FitKeepAspectRatio ( image: [600,600], view: [600,700] )" ); + tet_infoline( " There should be need to change the transform, offset is adjusted to fit inside"); + + ImageView imageView = ImageView::New(); + Property::Map imageMap; + imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); + imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image + imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE , Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO ); + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetSize(600,700); + + Stage::GetCurrent().Add( imageView ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); + // If there's value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); DALI_TEST_CHECK( value ); - DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2::ONE, TEST_LOCATION ); // Relative size so will take up 100% + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 50 ), TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewFittingModesFill(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using Fill ( image: [600,600], view: [600,700] )" ); + tet_infoline( " There should be no need to change the transform, only size is changed to fit view"); + + ImageView imageView = ImageView::New(); + Property::Map imageMap; + imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); + imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image + imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE , Toolkit::DevelVisual::FILL ); + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetSize(600,700); + + Stage::GetCurrent().Add( imageView ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2::ONE, TEST_LOCATION ); // Change the internal size according to the image view size value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); DALI_TEST_CHECK( value ); DALI_TEST_CHECK( value->Get< int >() == Toolkit::Visual::Transform::Policy::RELATIVE ); + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero + + END_TEST; +} + +int UtcDaliImageViewFittingModesOverfitKeepAspectRatio(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using OverFitKeepAspectRatio ( image: [600,600], view: [600,500] )" ); + tet_infoline( " offset or size is the same as view, but adjust internally using pixelArea "); + + ImageView imageView = ImageView::New(); + Property::Map imageMap; + imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); + imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image + imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE , Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO ); + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetSize(600,500); + + Stage::GetCurrent().Add( imageView ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); + + // If there's + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 500 ), TEST_LOCATION ); // Change the internal size according to the image view size + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero + + END_TEST; +} + +int UtcDaliImageViewFittingModesCenter01(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using Center ( image: [600,600], view: [700,700] )" ); + tet_infoline( " There should be need to change the transform, offset is adjusted to fit inside"); + + ImageView imageView = ImageView::New(); + Property::Map imageMap; + imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); + imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image + imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::CENTER); + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetSize(700,700); + + Stage::GetCurrent().Add( imageView ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 50 ), TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewFittingModesCenter02(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using Center ( image: [600,600], view: [500,500] )" ); + tet_infoline( " There should be need to change the transform, offset is adjusted to fit inside"); + + ImageView imageView = ImageView::New(); + Property::Map imageMap; + imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); + imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image + imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::CENTER); + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetSize(700,700); + + Stage::GetCurrent().Add( imageView ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 50 ), TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewFittingModesFitHeight01(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using FitHeight ( image: [600,600], view: [600,700] )" ); + + ImageView imageView = ImageView::New(); + Property::Map imageMap; + imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); + imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image + imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_HEIGHT); + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetSize(600,700); + + Stage::GetCurrent().Add( imageView ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero + + END_TEST; +} + +int UtcDaliImageViewFittingModesFitHeight02(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using FitHeight ( image: [600,600], view: [700,600] )" ); + + ImageView imageView = ImageView::New(); + Property::Map imageMap; + imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); + imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 249x169 image + imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_HEIGHT); + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetSize(700,600); + + Stage::GetCurrent().Add( imageView ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 0 ), TEST_LOCATION ); + END_TEST; } +int UtcDaliImageViewFittingModesFitWidth01(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using FitWidth ( image: [600,600], view: [600,700] )" ); + + ImageView imageView = ImageView::New(); + Property::Map imageMap; + imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); + imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 600x600 image + imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_WIDTH); + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetSize(600,700); + + Stage::GetCurrent().Add( imageView ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 50 ), TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewFittingModesFitWidth02(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using FitWidth ( image: [600,600], view:[700,600] )" ); + + ImageView imageView = ImageView::New(); + Property::Map imageMap; + imageMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); + imageMap.Add( Toolkit::ImageVisual::Property::URL, gImage_600_RGB ); // 249x169 image + imageMap.Add( DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FIT_WIDTH); + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetSize(700,600); + + Stage::GetCurrent().Add( imageView ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 700, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero + + END_TEST; +} + +int UtcDaliImageViewFittingModesChangeFittingMode01(void) +{ + ToolkitTestApplication application; + + tet_infoline( "UtcDaliImageViewFittingModesChangeFittingMode, image: [600,600], view:[800,700]" ); + + ImageView imageView = ImageView::New(); + + // 1. Render using FittingMode::SHRINK_TO_FIT + Property::Map imageMap; + imageMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; + imageMap[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB; + imageMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO; + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetSize(800,700); + + Stage::GetCurrent().Add( imageView ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 700, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 0 ), TEST_LOCATION ); + + // 2. Render again using DevelVisaul::CENTER + Property::Map imageMap2; + imageMap2[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; + imageMap2[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB; + imageMap2[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::CENTER; + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap2 ); + imageView.SetSize(800,700); + + Stage::GetCurrent().Add( imageView ); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + returnedMap.Clear(); + visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + + visual.CreatePropertyMap( returnedMap ); + + value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + map = value->GetMap(); + DALI_TEST_CHECK( map ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 100, 50 ), TEST_LOCATION ); + + // 3. Render again using before fittingMode + Property::Map imageMap3; + imageMap3[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; + imageMap3[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB; + imageMap3[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::FIT_KEEP_ASPECT_RATIO; + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap3 ); + imageView.SetSize(800,700); + + Stage::GetCurrent().Add( imageView ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + returnedMap.Clear(); + visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + visual.CreatePropertyMap( returnedMap ); + + value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + map = value->GetMap(); + DALI_TEST_CHECK( map ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 700, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 50, 0 ), TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewFittingModesChangeFittingMode02(void) +{ + ToolkitTestApplication application; + + tet_infoline( "UtcDaliImageViewFittingModesChangeFittingMode, image: [600,600], view:[800,700]" ); + + ImageView imageView = ImageView::New(); + + // 1. Render using FittingMode::OVER_FIT_KEEP_ASPECT_RATIO + Property::Map imageMap; + imageMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; + imageMap[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB; + imageMap[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO; + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetSize(800,700); + + Stage::GetCurrent().Add( imageView ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 800, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); + + // 2. Render again using DevelVisaul::CENTER + Property::Map imageMap2; + imageMap2[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; + imageMap2[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB; + imageMap2[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::CENTER; + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap2 ); + imageView.SetSize(800,700); + + Stage::GetCurrent().Add( imageView ); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + returnedMap.Clear(); + visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + + visual.CreatePropertyMap( returnedMap ); + + value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + map = value->GetMap(); + DALI_TEST_CHECK( map ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 600, 600 ), TEST_LOCATION ); // Change the internal size according to the image view size + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 100, 50 ), TEST_LOCATION ); + + // 3. Render again using before fittingMode + Property::Map imageMap3; + imageMap3[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE; + imageMap3[ Toolkit::ImageVisual::Property::URL ] = gImage_600_RGB; + imageMap3[ DevelVisual::Property::VISUAL_FITTING_MODE ] = Toolkit::DevelVisual::OVER_FIT_KEEP_ASPECT_RATIO; + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap3 ); + imageView.SetSize(800,700); + + Stage::GetCurrent().Add( imageView ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + returnedMap.Clear(); + visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + visual.CreatePropertyMap( returnedMap ); + + value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + map = value->GetMap(); + DALI_TEST_CHECK( map ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 800, 700 ), TEST_LOCATION ); // Change the internal size according to the image view size + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ), TEST_LOCATION ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliImageViewFittingModesWithAnimatedVectorImageVisual(void) +{ + ToolkitTestApplication application; + + tet_infoline( "Create an ImageVisual using ScaleToFill and animated vector image ( image: [600,600], view:[600,600] )" ); + + ImageView imageView = ImageView::New(); + Property::Map imageMap; + imageMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE ); + imageMap.Add( Toolkit::ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME ); // 249x169 image + + imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); + imageView.SetSize(600,600); + + Stage::GetCurrent().Add( imageView ); + + // Trigger a potential relayout + application.SendNotification(); + application.Render(); + + Toolkit::Visual::Base visual = DevelControl::GetVisual( Toolkit::Internal::GetImplementation( imageView ), Toolkit::ImageView::Property::IMAGE ); + Property::Map returnedMap; + visual.CreatePropertyMap( returnedMap ); + + Property::Value* value = returnedMap.Find( Toolkit::Visual::Property::TRANSFORM ); + DALI_TEST_CHECK( value ); + Property::Map* map = value->GetMap(); + DALI_TEST_CHECK( map ); + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2::ONE, TEST_LOCATION ); // Relative size so will take up 100% + + value = map->Find( Toolkit::Visual::Transform::Property::SIZE_POLICY ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get< int >() == Toolkit::Visual::Transform::Policy::RELATIVE ); + + value = map->Find( Toolkit::Visual::Transform::Property::OFFSET ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get< Vector2 >(), Vector2( 0, 0 ), TEST_LOCATION ); // OFFSET is zero + + END_TEST; +} + + int UtcDaliImageViewCustomShader(void) { ToolkitTestApplication application; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp index 98dc9dd..b049d26 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp @@ -859,7 +859,7 @@ int UtcDaliVisualGetPropertyMap5(void) value = resultMap.Find( ImageVisual::Property::FITTING_MODE, Property::INTEGER ); DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == FittingMode::SHRINK_TO_FIT ); + DALI_TEST_CHECK( value->Get() == FittingMode::DEFAULT ); value = resultMap.Find( ImageVisual::Property::SAMPLING_MODE, Property::INTEGER ); DALI_TEST_CHECK( value ); diff --git a/build/tizen/docs-internal/dali-internal.doxy.in b/build/tizen/docs-internal/dali-internal.doxy.in index 3fcaf37..738d9b9 100644 --- a/build/tizen/docs-internal/dali-internal.doxy.in +++ b/build/tizen/docs-internal/dali-internal.doxy.in @@ -355,6 +355,7 @@ ALIASES += SINCE_1_1="@since 1.1" ALIASES += SINCE_1_2="@since 1.2" ALIASES += SINCE_1_3="@since 1.3" ALIASES += SINCE_1_4="@since 1.4" +ALIASES += SINCE_1_9="@since 1.9" # Extra tags for Tizen 3.0 ALIASES += SINCE_1_2_2="@since 1.2.2" @@ -400,6 +401,7 @@ ALIASES += REMARK_RAWVIDEO="" #ALIASES += SINCE_1_2="\par Since:\n 4.0, DALi version 1.2" #ALIASES += SINCE_1_3="\par Since:\n 5.0, DALi version 1.3" #ALIASES += SINCE_1_4="\par Since:\n 5.5, DALi version 1.4" +#ALIASES += SINCE_1_9="\par Since:\n 6.0, DALi version 1.9" ## Extra tags for Tizen 3.0 #ALIASES += SINCE_1_2_2="\par Since:\n 3.0, DALi version 1.2.2" diff --git a/dali-toolkit/devel-api/visuals/visual-properties-devel.h b/dali-toolkit/devel-api/visuals/visual-properties-devel.h index fd83765..e30f241 100644 --- a/dali-toolkit/devel-api/visuals/visual-properties-devel.h +++ b/dali-toolkit/devel-api/visuals/visual-properties-devel.h @@ -90,8 +90,12 @@ enum Type */ enum FittingMode { - FIT_KEEP_ASPECT_RATIO, ///< The visual should be scaled to fit, preserving aspect ratio - FILL, ///< The visual should be stretched to fill, not preserving aspect ratio + FIT_KEEP_ASPECT_RATIO, ///< The visual should be scaled to fit, preserving aspect ratio + FILL, ///< The visual should be stretched to fill, not preserving aspect ratio + OVER_FIT_KEEP_ASPECT_RATIO,///< The visual should be scaled to fit, preserving aspect ratio. The visual will be filled without empty area, and outside is cropped away. + CENTER, ///< The visual should keep original size of image. It is not scaled and not strecthed. + FIT_HEIGHT, ///< The visual should be scaled to fit, preserving aspect ratio. Height is scaled proportionately to maintain aspect ratio. It will be deprecated. + FIT_WIDTH ///< The visual should be scaled to fit, preserving aspect ratio. Width is scaled proportionately to maintain aspect ratio. It will be deprecated. }; /** diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp index 035d1d8..28cbfff 100755 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 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. @@ -45,6 +45,8 @@ namespace Internal namespace { +const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); + BaseHandle Create() { return Toolkit::ImageView::New(); @@ -66,7 +68,8 @@ using namespace Dali; ImageView::ImageView() : Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), mImageSize(), - mImageVisualPaddingSetByTransform( false ) + mImageVisualPaddingSetByTransform( false ), + mImageViewPixelAreaSetByFittingMode( false ) { } @@ -286,57 +289,161 @@ float ImageView::GetWidthForHeight( float height ) void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container ) { Control::OnRelayout( size, container ); - if( mVisual ) { Property::Map transformMap = Property::Map(); Extents padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); - const Visual::FittingMode fittingMode = Toolkit::GetImplementation(mVisual).GetFittingMode(); bool zeroPadding = ( padding == Extents() ); - if( ( !zeroPadding ) || // If padding is not zero - ( fittingMode == Visual::FittingMode::FIT_KEEP_ASPECT_RATIO ) ) + + Vector2 naturalSize; + mVisual.GetNaturalSize( naturalSize ); + + Dali::LayoutDirection::Type layoutDirection = static_cast( + Self().GetProperty( Dali::Actor::Property::LAYOUT_DIRECTION ).Get() ); + if( Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection ) { - Dali::LayoutDirection::Type layoutDirection = static_cast( - Self().GetProperty( Dali::Actor::Property::LAYOUT_DIRECTION ).Get() ); + std::swap( padding.start, padding.end ); + } - if( Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection ) - { - std::swap( padding.start, padding.end ); - } + // remove padding from the size to know how much is left for the visual + Vector2 finalSize = size - Vector2( padding.start + padding.end, padding.top + padding.bottom ); + Vector2 finalOffset = Vector2( padding.start, padding.top ); - auto finalOffset = Vector2( padding.start, padding.top ); - mImageVisualPaddingSetByTransform = true; + ApplyFittingMode( finalSize, naturalSize, finalOffset, zeroPadding , transformMap ); - // remove padding from the size to know how much is left for the visual - auto finalSize = size - Vector2( padding.start + padding.end, padding.top + padding.bottom ); + mVisual.SetTransformAndSize( transformMap, size ); - // Should provide a transform that handles aspect ratio according to image size - if( fittingMode == Visual::FittingMode::FIT_KEEP_ASPECT_RATIO ) - { - auto availableVisualSize = finalSize; + // mVisual is not updated util the resource is ready in the case of visual replacement. + // So apply the transform and size to the new visual. + Toolkit::Visual::Base visual = DevelControl::GetVisual( *this, Toolkit::ImageView::Property::IMAGE ); + if( visual && visual != mVisual ) + { + visual.SetTransformAndSize( transformMap, size ); + } + } +} + +void ImageView::OnResourceReady( Toolkit::Control control ) +{ + // Visual ready so update visual attached to this ImageView, following call to RelayoutRequest will use this visual. + mVisual = DevelControl::GetVisual( *this, Toolkit::ImageView::Property::IMAGE ); + // Signal that a Relayout may be needed +} - Vector2 naturalSize; - mVisual.GetNaturalSize( naturalSize ); +void ImageView::SetTransformMapForFittingMode( Vector2 finalSize, Vector2 naturalSize, Vector2 finalOffset, Visual::FittingMode fittingMode, Property::Map& transformMap ) +{ + switch(fittingMode) + { + case Visual::FittingMode::FIT_KEEP_ASPECT_RATIO: + { + auto availableVisualSize = finalSize; - // scale to fit the padded area - finalSize = naturalSize * std::min( ( naturalSize.width ? ( availableVisualSize.width / naturalSize.width ) : 0 ), + // scale to fit the padded area + finalSize = naturalSize * std::min( ( naturalSize.width ? ( availableVisualSize.width / naturalSize.width ) : 0 ), ( naturalSize.height ? ( availableVisualSize.height / naturalSize.height ) : 0 ) ); - // calculate final offset within the padded area - finalOffset += ( availableVisualSize - finalSize ) * .5f; + // calculate final offset within the padded area + finalOffset += ( availableVisualSize - finalSize ) * .5f; + + // populate the transform map + transformMap.Add( Toolkit::Visual::Transform::Property::OFFSET, finalOffset ) + .Add( Toolkit::Visual::Transform::Property::SIZE, finalSize ); + break; + } + case Visual::FittingMode::OVER_FIT_KEEP_ASPECT_RATIO: + { + mImageViewPixelAreaSetByFittingMode = true; + auto availableVisualSize = finalSize; + finalSize = naturalSize * std::max( ( naturalSize.width ? ( availableVisualSize.width / naturalSize.width ) : 0 ), + ( naturalSize.height ? ( availableVisualSize.height / naturalSize.height ) : 0 ) ); + + auto originalOffset = finalOffset; + finalOffset += ( availableVisualSize - finalSize ) * .5f; + + float x = abs( (availableVisualSize.width - finalSize.width ) / finalSize.width )* .5f; + float y = abs( (availableVisualSize.height - finalSize.height ) / finalSize.height ) * .5f; + float widthRatio = 1.f - abs( (availableVisualSize.width - finalSize.width ) / finalSize.width ); + float heightRatio = 1.f - abs( (availableVisualSize.height - finalSize.height ) / finalSize.height ); + Vector4 pixelArea = Vector4( x, y, widthRatio, heightRatio); + Self().SetProperty( Toolkit::ImageView::Property::PIXEL_AREA, pixelArea ); + + // populate the transform map + transformMap.Add( Toolkit::Visual::Transform::Property::OFFSET, originalOffset ) + .Add( Toolkit::Visual::Transform::Property::SIZE, availableVisualSize ); + break; + } + case Visual::FittingMode::CENTER: + { + auto availableVisualSize = finalSize; + if( availableVisualSize.width > naturalSize.width && availableVisualSize.height > naturalSize.height ) + { + finalSize = naturalSize; + } + else + { + finalSize = naturalSize * std::min( ( naturalSize.width ? ( availableVisualSize.width / naturalSize.width ) : 0 ), + ( naturalSize.height ? ( availableVisualSize.height / naturalSize.height ) : 0 ) ); } + finalOffset += ( availableVisualSize - finalSize ) * .5f; + // populate the transform map transformMap.Add( Toolkit::Visual::Transform::Property::OFFSET, finalOffset ) - .Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, - Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) ) + .Add( Toolkit::Visual::Transform::Property::SIZE, finalSize ); + break; + } + case Visual::FittingMode::FILL: + { + transformMap.Add( Toolkit::Visual::Transform::Property::OFFSET, finalOffset ) + .Add( Toolkit::Visual::Transform::Property::SIZE, finalSize ); + break; + } + case Visual::FittingMode::FIT_WIDTH: + case Visual::FittingMode::FIT_HEIGHT: + { + // This FittingMode already converted + break; + } + } +} + +void ImageView::ApplyFittingMode( Vector2 finalSize, Vector2 naturalSize, Vector2 finalOffset, bool zeroPadding , Property::Map& transformMap ) +{ + Visual::FittingMode fittingMode = Toolkit::GetImplementation(mVisual).GetFittingMode(); + + // Reset PIXEL_AREA after using OVER_FIT_KEEP_ASPECT_RATIO + if( mImageViewPixelAreaSetByFittingMode ) + { + Self().SetProperty( Toolkit::ImageView::Property::PIXEL_AREA, FULL_TEXTURE_RECT ); + mImageViewPixelAreaSetByFittingMode = false; + } + + if( ( !zeroPadding ) || // If padding is not zero + ( fittingMode != Visual::FittingMode::FILL ) ) + { + mImageVisualPaddingSetByTransform = true; + + // If FittingMode use FIT_WIDTH or FIT_HEIGTH, it need to change proper fittingMode + if( fittingMode == Visual::FittingMode::FIT_WIDTH ) + { + fittingMode = ( finalSize.height / naturalSize.height ) < ( finalSize.width / naturalSize.width ) ? Visual::FittingMode::OVER_FIT_KEEP_ASPECT_RATIO : Visual::FittingMode::FIT_KEEP_ASPECT_RATIO; + } + else if( fittingMode == Visual::FittingMode::FIT_HEIGHT ) + { + fittingMode = ( finalSize.height / naturalSize.height ) < ( finalSize.width / naturalSize.width ) ? Visual::FittingMode::FIT_KEEP_ASPECT_RATIO : Visual::FittingMode::OVER_FIT_KEEP_ASPECT_RATIO; + } + + SetTransformMapForFittingMode( finalSize, naturalSize, finalOffset, fittingMode, transformMap ); + + // Set extra value for applying transformMap + transformMap.Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, + Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) ) .Add( Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::TOP_BEGIN ) .Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::TOP_BEGIN ) - .Add( Toolkit::Visual::Transform::Property::SIZE, finalSize ) .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, - Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) ); + Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) ); } else if ( mImageVisualPaddingSetByTransform && zeroPadding ) // Reset offset to zero only if padding applied previously { @@ -344,27 +451,11 @@ void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container ) // Reset the transform map transformMap.Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2::ZERO ) .Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, + Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) ) + .Add( Toolkit::Visual::Transform::Property::SIZE, Vector2::ONE ) + .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) ); } - - - mVisual.SetTransformAndSize( transformMap, size ); - - // mVisual is not updated util the resource is ready in the case of visual replacement. - // So apply the transform and size to the new visual. - Toolkit::Visual::Base visual = DevelControl::GetVisual( *this, Toolkit::ImageView::Property::IMAGE ); - if( visual && visual != mVisual ) - { - visual.SetTransformAndSize( transformMap, size ); - } - } -} - -void ImageView::OnResourceReady( Toolkit::Control control ) -{ - // Visual ready so update visual attached to this ImageView, following call to RelayoutRequest will use this visual. - mVisual = DevelControl::GetVisual( *this, Toolkit::ImageView::Property::IMAGE ); - // Signal that a Relayout may be needed } /////////////////////////////////////////////////////////// diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.h b/dali-toolkit/internal/controls/image-view/image-view-impl.h index fe1bac1..382feb8 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.h +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h @@ -155,6 +155,26 @@ private: */ void OnResourceReady( Toolkit::Control control ); + /** + * @brief Set TransformMap for fittingMode + * param[in] finalSize The size for fittingMode + * param[in] textureSize The size of texture + * param[in] offset The offset for fittingMode + * param[in] fittingMode The mode for fitting image + * param[in] transformMap The map for fitting image + */ + void SetTransformMapForFittingMode ( Vector2 finalSize, Vector2 textureSize, Vector2 offset, Visual::FittingMode fittingMode, Property::Map& transformMap ); + + /** + * @brief Apply fittingMode + * param[in] finalSize The size for fittingMode + * param[in] textureSize The size of texture + * param[in] offset The offset for fittingMode + * param[in] zeroPadding whether padding is zero + * param[in] transformMap The map for fitting image + */ + void ApplyFittingMode( Vector2 finalSize, Vector2 textureSize, Vector2 offset, bool zeroPadding , Property::Map& transformMap); + private: // Undefined ImageView( const ImageView& ); @@ -170,6 +190,7 @@ private: ImageDimensions mImageSize; ///< the image size bool mImageVisualPaddingSetByTransform :1; //< Flag to indicate Padding was set using a transform. + bool mImageViewPixelAreaSetByFittingMode:1; //< Flag to indicate pixel area was set by fitting Mode }; } // namespace Internal diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index c553ced..ea4aaa2 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -122,6 +122,7 @@ Geometry CreateGeometry( VisualFactoryCache& factoryCache, ImageDimensions gridS } // unnamed namespace + ImageVisualPtr ImageVisual::New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, @@ -182,7 +183,7 @@ ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, } ImageVisual::ImageVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const Image& image ) -: Visual::Base( factoryCache, Visual::FittingMode::FIT_KEEP_ASPECT_RATIO ), +: Visual::Base( factoryCache, Visual::FittingMode::FILL ), mImage( image ), mPixelArea( FULL_TEXTURE_RECT ), mPlacementActor(), @@ -544,7 +545,6 @@ void ImageVisual::GetNaturalSize( Vector2& naturalSize ) return; } } - naturalSize = Vector2::ZERO; } diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.h b/dali-toolkit/internal/visuals/texture-manager-impl.h index 5146991..df6c6f7 100755 --- a/dali-toolkit/internal/visuals/texture-manager-impl.h +++ b/dali-toolkit/internal/visuals/texture-manager-impl.h @@ -521,7 +521,7 @@ private: float scaleFactor; ///< The scale factor to apply to the Texture when masking int16_t referenceCount; ///< The reference count of clients using this Texture LoadState loadState:4; ///< The load state showing the load progress of the Texture - FittingMode::Type fittingMode:2; ///< The requested FittingMode + FittingMode::Type fittingMode:3; ///< The requested FittingMode Dali::SamplingMode::Type samplingMode:3; ///< The requested SamplingMode StorageType storageType:2; ///< CPU storage / GPU upload; bool loadSynchronously:1; ///< True if synchronous loading was requested diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index b03a5ef..2cbca7d 100755 --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -59,6 +59,10 @@ namespace DALI_ENUM_TO_STRING_TABLE_BEGIN( VISUAL_FITTING_MODE ) DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, FIT_KEEP_ASPECT_RATIO ) DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, FILL ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, OVER_FIT_KEEP_ASPECT_RATIO ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, CENTER ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, FIT_WIDTH ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, FIT_HEIGHT ) DALI_ENUM_TO_STRING_TABLE_END( VISUAL_FITTING_MODE ) } // namespace -- 2.7.4 From 7e70030cf93577ddee52ea2c954b16c5fc02446a Mon Sep 17 00:00:00 2001 From: "Seungho, Baek" Date: Tue, 26 May 2020 14:40:32 +0900 Subject: [PATCH 16/16] Check loadPixelBuffer in the Caching Texture - A image can be entered twice one as ImageVisual another as NinePatchVisual. - If ImageVisual is already entered, the image is already Uploaded to the Texture - But, NinePatchVisual need only PixelBuffer. - So, we need to cache them separately Change-Id: Ib0824645da70d172fb603b957c999967eef663d7 Signed-off-by: Seungho, Baek --- .../utc-Dali-TextureManager.cpp | 89 +++++++++++++++++++++- .../internal/visuals/texture-manager-impl.cpp | 46 ++++++----- .../internal/visuals/texture-manager-impl.h | 32 ++++---- 3 files changed, 130 insertions(+), 37 deletions(-) diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp index 21f6f7c..f2b032d 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-TextureManager.cpp @@ -20,8 +20,11 @@ #include #include +#include +#include #include #include +#include using namespace Dali::Toolkit::Internal; @@ -37,11 +40,27 @@ void utc_dali_toolkit_texture_manager_cleanup(void) test_return_value = TET_PASS; } +namespace +{ + +const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/gallery-small-1.jpg"; + +} + class TestObserver : public Dali::Toolkit::TextureUploadObserver { public: + enum class CompleteType + { + NOT_COMPLETED = 0, + UPLOAD_COMPLETE, + LOAD_COMPLETE + }; + +public: TestObserver() - : mLoaded(false), + : mCompleteType( CompleteType::NOT_COMPLETED ), + mLoaded(false), mObserverCalled(false) { } @@ -49,16 +68,19 @@ public: virtual void UploadComplete( bool loadSuccess, int32_t textureId, TextureSet textureSet, bool useAtlasing, const Vector4& atlasRect, bool preMultiplied ) override { + mCompleteType = CompleteType::UPLOAD_COMPLETE; mLoaded = loadSuccess; mObserverCalled = true; } virtual void LoadComplete( bool loadSuccess, Devel::PixelBuffer pixelBuffer, const VisualUrl& url, bool preMultiplied ) override { + mCompleteType = CompleteType::LOAD_COMPLETE; mLoaded = loadSuccess; mObserverCalled = true; } + CompleteType mCompleteType; bool mLoaded; bool mObserverCalled; }; @@ -117,3 +139,68 @@ int UtcTextureManagerGenerateHash(void) END_TEST; } + +int UtcTextureManagerCachingForDifferentLoadingType(void) +{ + ToolkitTestApplication application; + tet_infoline( "UtcTextureManagerCachingForDifferentLoadingType" ); + + TextureManager textureManager; // Create new texture manager + + TestObserver observer1; + std::string filename( TEST_IMAGE_FILE_NAME ); + auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY; + textureManager.RequestLoad( + filename, + ImageDimensions(), + FittingMode::SCALE_TO_FILL, + SamplingMode::BOX_THEN_LINEAR, + TextureManager::NO_ATLAS, + &observer1, + true, + TextureManager::ReloadPolicy::CACHED, + preMultiply); + + DALI_TEST_EQUALS( observer1.mLoaded, false, TEST_LOCATION ); + DALI_TEST_EQUALS( observer1.mObserverCalled, false, TEST_LOCATION ); + + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS( observer1.mLoaded, true, TEST_LOCATION ); + DALI_TEST_EQUALS( observer1.mObserverCalled, true, TEST_LOCATION ); + DALI_TEST_EQUALS( observer1.mCompleteType, TestObserver::CompleteType::UPLOAD_COMPLETE, TEST_LOCATION ); + + TestObserver observer2; + Devel::PixelBuffer pixelBuffer = textureManager.LoadPixelBuffer( + filename, + ImageDimensions(), + FittingMode::SCALE_TO_FILL, + SamplingMode::BOX_THEN_LINEAR, + false, + &observer2, + true, + preMultiply); + + DALI_TEST_EQUALS( observer2.mLoaded, false, TEST_LOCATION ); + DALI_TEST_EQUALS( observer2.mObserverCalled, false, TEST_LOCATION ); + + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS( observer2.mLoaded, true, TEST_LOCATION ); + DALI_TEST_EQUALS( observer2.mObserverCalled, true, TEST_LOCATION ); + DALI_TEST_EQUALS( observer2.mCompleteType, TestObserver::CompleteType::LOAD_COMPLETE, TEST_LOCATION ); + + END_TEST; +} diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.cpp b/dali-toolkit/internal/visuals/texture-manager-impl.cpp index 71385e2..612433d 100644 --- a/dali-toolkit/internal/visuals/texture-manager-impl.cpp +++ b/dali-toolkit/internal/visuals/texture-manager-impl.cpp @@ -163,8 +163,8 @@ Devel::PixelBuffer TextureManager::LoadPixelBuffer( else { RequestLoadInternal( url, INVALID_TEXTURE_ID, 1.0f, desiredSize, fittingMode, samplingMode, TextureManager::NO_ATLAS, - false, KEEP_PIXEL_BUFFER, textureObserver, orientationCorrection, TextureManager::ReloadPolicy::FORCED, - preMultiplyOnLoad, true ); + false, RETURN_PIXEL_BUFFER, textureObserver, orientationCorrection, TextureManager::ReloadPolicy::FORCED, + preMultiplyOnLoad ); } return pixelBuffer; @@ -337,7 +337,7 @@ TextureManager::TextureId TextureManager::RequestLoad( { return RequestLoadInternal( url, INVALID_TEXTURE_ID, 1.0f, desiredSize, fittingMode, samplingMode, useAtlas, false, UPLOAD_TO_TEXTURE, observer, orientationCorrection, reloadPolicy, - preMultiplyOnLoad, false ); + preMultiplyOnLoad ); } TextureManager::TextureId TextureManager::RequestLoad( @@ -356,7 +356,7 @@ TextureManager::TextureId TextureManager::RequestLoad( { return RequestLoadInternal( url, maskTextureId, contentScale, desiredSize, fittingMode, samplingMode, useAtlas, cropToMask, UPLOAD_TO_TEXTURE, observer, orientationCorrection, reloadPolicy, - preMultiplyOnLoad, false ); + preMultiplyOnLoad ); } TextureManager::TextureId TextureManager::RequestMaskLoad( const VisualUrl& maskUrl ) @@ -365,7 +365,7 @@ TextureManager::TextureId TextureManager::RequestMaskLoad( const VisualUrl& mask auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY; return RequestLoadInternal( maskUrl, INVALID_TEXTURE_ID, 1.0f, ImageDimensions(), FittingMode::SCALE_TO_FILL, SamplingMode::NO_FILTER, NO_ATLAS, false, KEEP_PIXEL_BUFFER, NULL, true, - TextureManager::ReloadPolicy::CACHED, preMultiply, false ); + TextureManager::ReloadPolicy::CACHED, preMultiply ); } TextureManager::TextureId TextureManager::RequestLoadInternal( @@ -381,18 +381,16 @@ TextureManager::TextureId TextureManager::RequestLoadInternal( TextureUploadObserver* observer, bool orientationCorrection, TextureManager::ReloadPolicy reloadPolicy, - TextureManager::MultiplyOnLoad& preMultiplyOnLoad, - bool loadPixelBuffer ) + TextureManager::MultiplyOnLoad& preMultiplyOnLoad ) { // First check if the requested Texture is cached. const TextureHash textureHash = GenerateHash( url.GetUrl(), desiredSize, fittingMode, samplingMode, useAtlas, maskTextureId ); TextureManager::TextureId textureId = INVALID_TEXTURE_ID; - // Look up the texture by hash. Note: The extra parameters are used in case of a hash collision. int cacheIndex = FindCachedTexture( textureHash, url.GetUrl(), desiredSize, fittingMode, samplingMode, useAtlas, - maskTextureId, preMultiplyOnLoad ); + maskTextureId, preMultiplyOnLoad, storageType ); // Check if the requested Texture exists in the cache. if( cacheIndex != INVALID_CACHE_INDEX ) @@ -420,7 +418,7 @@ TextureManager::TextureId TextureManager::RequestLoadInternal( mTextureInfoContainer.push_back( TextureInfo( textureId, maskTextureId, url.GetUrl(), desiredSize, contentScale, fittingMode, samplingMode, false, cropToMask, useAtlas, textureHash, orientationCorrection, - preMultiply, loadPixelBuffer ) ); + preMultiply ) ); cacheIndex = mTextureInfoContainer.size() - 1u; DALI_LOG_INFO( gTextureManagerLogFilter, Debug::General, "TextureManager::RequestLoad( url=%s observer=%p ) New texture, cacheIndex:%d, textureId=%d\n", @@ -448,6 +446,7 @@ TextureManager::TextureId TextureManager::RequestLoadInternal( { DALI_LOG_INFO( gTextureManagerLogFilter, Debug::Verbose, "TextureManager::RequestLoad( url=%s observer=%p ) ForcedReload cacheIndex:%d, textureId=%d\n", url.GetUrl().c_str(), observer, cacheIndex, textureId ); + textureInfo.loadState = TextureManager::NOT_STARTED; } @@ -486,12 +485,14 @@ TextureManager::TextureId TextureManager::RequestLoadInternal( break; } case TextureManager::LOAD_FINISHED: + { // Loading has already completed. - if( observer && textureInfo.loadPixelBuffer ) + if( observer && textureInfo.storageType == StorageType::RETURN_PIXEL_BUFFER ) { LoadOrQueueTexture( textureInfo, observer ); } break; + } } // Return the TextureId for which this Texture can now be referenced by externally. @@ -786,7 +787,7 @@ void TextureManager::ProcessQueuedTextures() textureInfo.useAtlas, textureInfo.atlasRect, textureInfo.preMultiplied ); } - else if ( textureInfo.loadState == LOAD_FINISHED && textureInfo.loadPixelBuffer ) + else if ( textureInfo.loadState == LOAD_FINISHED && textureInfo.storageType == StorageType::RETURN_PIXEL_BUFFER ) { element.mObserver->LoadComplete( true, textureInfo.pixelBuffer, textureInfo.url, textureInfo.preMultiplied ); } @@ -896,13 +897,16 @@ void TextureManager::PostLoad( TextureInfo& textureInfo, Devel::PixelBuffer& pix textureInfo.pixelBuffer = pixelBuffer; // Store the pixel data textureInfo.loadState = LOAD_FINISHED; - if( textureInfo.loadPixelBuffer ) + if( textureInfo.storageType == StorageType::RETURN_PIXEL_BUFFER ) { NotifyObservers( textureInfo, true ); } - // Check if there was another texture waiting for this load to complete - // (e.g. if this was an image mask, and its load is on a different thread) - CheckForWaitingTexture( textureInfo ); + else + { + // Check if there was another texture waiting for this load to complete + // (e.g. if this was an image mask, and its load is on a different thread) + CheckForWaitingTexture( textureInfo ); + } } } else @@ -1022,7 +1026,7 @@ void TextureManager::NotifyObservers( TextureInfo& textureInfo, bool success ) info->observerList.Erase( info->observerList.begin() ); - if( info->loadPixelBuffer ) + if( info->storageType == StorageType::RETURN_PIXEL_BUFFER ) { observer->LoadComplete( success, info->pixelBuffer, info->url, info->preMultiplied ); } @@ -1044,7 +1048,7 @@ void TextureManager::NotifyObservers( TextureInfo& textureInfo, bool success ) mQueueLoadFlag = false; ProcessQueuedTextures(); - if( info->loadPixelBuffer && info->observerList.Count() == 0 ) + if( info->storageType == StorageType::RETURN_PIXEL_BUFFER && info->observerList.Count() == 0 ) { Remove( info->textureId, nullptr ); } @@ -1147,7 +1151,8 @@ int TextureManager::FindCachedTexture( const Dali::SamplingMode::Type samplingMode, const bool useAtlas, TextureId maskTextureId, - TextureManager::MultiplyOnLoad preMultiplyOnLoad ) + TextureManager::MultiplyOnLoad preMultiplyOnLoad, + StorageType storageType ) { // Default to an invalid ID, in case we do not find a match. int cacheIndex = INVALID_CACHE_INDEX; @@ -1167,7 +1172,8 @@ int TextureManager::FindCachedTexture( ( size == textureInfo.desiredSize ) && ( ( size.GetWidth() == 0 && size.GetHeight() == 0 ) || ( fittingMode == textureInfo.fittingMode && - samplingMode == textureInfo.samplingMode ) ) ) + samplingMode == textureInfo.samplingMode ) ) && + ( storageType == textureInfo.storageType ) ) { // 1. If preMultiplyOnLoad is MULTIPLY_ON_LOAD, then textureInfo.preMultiplyOnLoad should be true. The premultiplication result can be different. // 2. If preMultiplyOnLoad is LOAD_WITHOUT_MULTIPLY, then textureInfo.preMultiplied should be false. diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.h b/dali-toolkit/internal/visuals/texture-manager-impl.h index df6c6f7..cc5c0e4 100755 --- a/dali-toolkit/internal/visuals/texture-manager-impl.h +++ b/dali-toolkit/internal/visuals/texture-manager-impl.h @@ -73,11 +73,12 @@ public: }; /** - * Whether the pixel data should be kept in TextureManager, or uploaded for rendering + * Whether the pixel data should be kept in TextureManager, returned with pixelBuffer or uploaded for rendering */ enum StorageType { KEEP_PIXEL_BUFFER, + RETURN_PIXEL_BUFFER, UPLOAD_TO_TEXTURE }; @@ -445,8 +446,7 @@ private: TextureUploadObserver* observer, bool orientationCorrection, TextureManager::ReloadPolicy reloadPolicy, - MultiplyOnLoad& preMultiplyOnLoad, - bool loadPixelBuffer ); + MultiplyOnLoad& preMultiplyOnLoad ); /** * @brief Get the current state of a texture @@ -477,8 +477,7 @@ private: UseAtlas useAtlas, TextureManager::TextureHash hash, bool orientationCorrection, - bool preMultiplyOnLoad, - bool loadPixelBuffer ) + bool preMultiplyOnLoad ) : url( url ), desiredSize( desiredSize ), useSize( desiredSize ), @@ -497,8 +496,7 @@ private: cropToMask( cropToMask ), orientationCorrection( true ), preMultiplyOnLoad( preMultiplyOnLoad ), - preMultiplied( false ), - loadPixelBuffer( loadPixelBuffer ) + preMultiplied( false ) { } @@ -531,7 +529,6 @@ private: bool orientationCorrection:1; ///< true if the image should be rotated to match exif orientation data bool preMultiplyOnLoad:1; ///< true if the image's color should be multiplied by it's alpha bool preMultiplied:1; ///< true if the image's color was multiplied by it's alpha - bool loadPixelBuffer:1; ///< true if the image is needed to be returned as PixelBuffer }; /** @@ -704,13 +701,15 @@ private: /** * @brief Looks up a cached texture by its hash. * If found, the given parameters are used to check there is no hash-collision. - * @param[in] hash The hash to look up - * @param[in] url The URL of the image to load - * @param[in] size The image size - * @param[in] fittingMode The FittingMode to use - * @param[in] samplingMode The SamplingMode to use - * @param[in] useAtlas True if atlased - * @param[in] maskTextureId Optional texture ID to use to mask this image + * @param[in] hash The hash to look up + * @param[in] url The URL of the image to load + * @param[in] size The image size + * @param[in] fittingMode The FittingMode to use + * @param[in] samplingMode The SamplingMode to use + * @param[in] useAtlas True if atlased + * @param[in] maskTextureId Optional texture ID to use to mask this image + * @param[in] preMultiplyOnLoad if the image's color should be multiplied by it's alpha. Set to OFF if there is no alpha. + * @param[in] storageType Whether the pixel data is stored in the cache, returned with PixelBuffer or uploaded to the GPU * @return A TextureId of a cached Texture if found. Or INVALID_TEXTURE_ID if not found. */ TextureManager::TextureId FindCachedTexture( @@ -721,7 +720,8 @@ private: const Dali::SamplingMode::Type samplingMode, const bool useAtlas, TextureId maskTextureId, - MultiplyOnLoad preMultiplyOnLoad); + MultiplyOnLoad preMultiplyOnLoad, + StorageType storageType ); private: -- 2.7.4