From d2a6f4d721fbc03b51d4f1328a58b1fa65f90d43 Mon Sep 17 00:00:00 2001 From: seungho Date: Mon, 18 Oct 2021 13:56:26 +0900 Subject: [PATCH] Refactoring VisualActions Change-Id: Id56e3a5e5910b2fbbb8428abd96897d7bcd10ae1 Signed-off-by: seungho --- .../utc-Dali-AnimatedVectorImageVisual.cpp | 31 ++++++------- .../src/dali-toolkit/utc-Dali-ArcVisual.cpp | 4 +- dali-toolkit/devel-api/file.list | 4 +- .../devel-api/toolkit-action-index-ranges.h | 51 +++++++++++++++++++++ .../visuals/animated-image-visual-actions-devel.h | 11 ++--- .../animated-vector-image-visual-actions-devel.h | 10 ++--- .../devel-api/visuals/arc-visual-actions-devel.h | 52 ---------------------- .../devel-api/visuals/image-visual-actions-devel.h | 5 ++- ...sual-actions-devel.h => visual-actions-devel.h} | 20 +++++---- .../animated-image/animated-image-visual.cpp | 2 +- .../visuals/animated-image/animated-image-visual.h | 3 +- .../animated-vector-image-visual.cpp | 10 +---- dali-toolkit/internal/visuals/arc/arc-visual.cpp | 18 -------- dali-toolkit/internal/visuals/arc/arc-visual.h | 5 --- .../internal/visuals/color/color-visual.cpp | 18 -------- dali-toolkit/internal/visuals/color/color-visual.h | 5 --- dali-toolkit/internal/visuals/visual-base-impl.cpp | 15 +++++++ dali-toolkit/public-api/controls/control-impl.cpp | 4 +- 18 files changed, 118 insertions(+), 150 deletions(-) create mode 100644 dali-toolkit/devel-api/toolkit-action-index-ranges.h delete mode 100644 dali-toolkit/devel-api/visuals/arc-visual-actions-devel.h rename dali-toolkit/devel-api/visuals/{color-visual-actions-devel.h => visual-actions-devel.h} (60%) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp index 7f43240..1eb713e 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -707,7 +708,7 @@ int UtcDaliAnimatedVectorImageVisualPlayRange(void) attributes.Clear(); attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array ); - DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); application.SendNotification(); application.Render(); @@ -746,7 +747,7 @@ int UtcDaliAnimatedVectorImageVisualPlayRange(void) attributes.Clear(); attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array ); - DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); application.SendNotification(); application.Render(); @@ -825,7 +826,7 @@ int UtcDaliAnimatedVectorImageVisualPlayRangeMarker(void) attributes.Clear(); attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array ); - DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); application.SendNotification(); application.Render(); @@ -849,7 +850,7 @@ int UtcDaliAnimatedVectorImageVisualPlayRangeMarker(void) attributes.Clear(); attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array ); - DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); application.SendNotification(); application.Render(); @@ -956,7 +957,7 @@ int UtcDaliAnimatedVectorImageVisualJumpTo(void) Property::Map attributes; attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array ); - DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3 ); @@ -979,7 +980,7 @@ int UtcDaliAnimatedVectorImageVisualJumpTo(void) array.PushBack( 4 ); attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array ); - DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); attributes.Clear(); DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes ); @@ -1074,7 +1075,7 @@ int UtcDaliAnimatedVectorImageVisualUpdateProperty(void) attributes.Add( DevelImageVisual::Property::PLAY_RANGE, playRange ); attributes.Add( DevelImageVisual::Property::LOOP_COUNT, 5 ); - DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); application.SendNotification(); application.Render(); @@ -1100,7 +1101,7 @@ int UtcDaliAnimatedVectorImageVisualUpdateProperty(void) attributes.Add( DevelImageVisual::Property::PLAY_RANGE, playRange ); - DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); application.SendNotification(); application.Render(); @@ -1125,7 +1126,7 @@ int UtcDaliAnimatedVectorImageVisualUpdateProperty(void) attributes.Add( DevelImageVisual::Property::LOOP_COUNT, 10 ); - DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); application.SendNotification(); application.Render(); @@ -1176,7 +1177,7 @@ int UtcDaliAnimatedVectorImageVisualStopBehavior(void) // Change stop behavior attributes.Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME ); - DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); attributes.Clear(); @@ -1201,7 +1202,7 @@ int UtcDaliAnimatedVectorImageVisualStopBehavior(void) attributes.Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::CURRENT_FRAME ); attributes.Add( DevelImageVisual::Property::LOOP_COUNT, -1 ); - DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); attributes.Clear(); @@ -1271,7 +1272,7 @@ int UtcDaliAnimatedVectorImageVisualLoopingMode(void) // Change stop behavior attributes.Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::CURRENT_FRAME ); - DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); // Play again DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes ); @@ -1289,7 +1290,7 @@ int UtcDaliAnimatedVectorImageVisualLoopingMode(void) // Change looping mode attributes.Add( DevelImageVisual::Property::LOOPING_MODE, DevelImageVisual::LoopingMode::RESTART ); - DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); // Play again DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes ); @@ -1418,8 +1419,8 @@ int UtcDaliAnimatedVectorImageVisualMultipleInstances(void) Property::Map attributes; attributes.Add( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME ); - DevelControl::DoAction( actor1, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); - DevelControl::DoAction( actor2, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor1, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor2, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); DevelControl::DoAction( actor1, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, Property::Map() ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ArcVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ArcVisual.cpp index 583ce16..146a1b5 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ArcVisual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ArcVisual.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include "dummy-control.h" @@ -307,7 +307,7 @@ int UtcDaliArcVisualUpdateProperty(void) .Add( DevelArcVisual::Property::START_ANGLE, startAngle ) .Add( DevelArcVisual::Property::SWEEP_ANGLE, sweepAngle ); - DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelArcVisual::Action::UPDATE_PROPERTY, attributes ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, attributes ); application.SendNotification(); application.Render(); diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list index e94f60b..c88b7a0 100755 --- a/dali-toolkit/devel-api/file.list +++ b/dali-toolkit/devel-api/file.list @@ -77,6 +77,7 @@ SET( devel_api_src_files SET( devel_api_header_files ${devel_api_src_dir}/direction-enums.h ${devel_api_src_dir}/toolkit-property-index-ranges.h + ${devel_api_src_dir}/toolkit-action-index-ranges.h ) SET( devel_api_accessibility-manager_header_files @@ -168,13 +169,12 @@ SET( devel_api_visuals_header_files ${devel_api_src_dir}/visuals/animated-image-visual-actions-devel.h ${devel_api_src_dir}/visuals/animated-vector-image-visual-actions-devel.h ${devel_api_src_dir}/visuals/animated-vector-image-visual-signals-devel.h - ${devel_api_src_dir}/visuals/arc-visual-actions-devel.h ${devel_api_src_dir}/visuals/arc-visual-properties-devel.h - ${devel_api_src_dir}/visuals/color-visual-actions-devel.h ${devel_api_src_dir}/visuals/color-visual-properties-devel.h ${devel_api_src_dir}/visuals/image-visual-properties-devel.h ${devel_api_src_dir}/visuals/image-visual-actions-devel.h ${devel_api_src_dir}/visuals/text-visual-properties-devel.h + ${devel_api_src_dir}/visuals/visual-actions-devel.h ${devel_api_src_dir}/visuals/visual-properties-devel.h ) diff --git a/dali-toolkit/devel-api/toolkit-action-index-ranges.h b/dali-toolkit/devel-api/toolkit-action-index-ranges.h new file mode 100644 index 0000000..8e5dbc4 --- /dev/null +++ b/dali-toolkit/devel-api/toolkit-action-index-ranges.h @@ -0,0 +1,51 @@ +#ifndef DALI_TOOLKIT_ACTION_INDEX_RANGES_H +#define DALI_TOOLKIT_ACTION_INDEX_RANGES_H + +/* + * Copyright (c) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// EXTERNAL INCLUDES +#include + +namespace Dali +{ +namespace Toolkit +{ +/** + * @addtogroup dali_toolkit_controls + * @{ + */ + +/** + * @brief Enumeration for the start and end action ranges. + */ +enum ActionRanges +{ + VISUAL_ACTION_BASE_START_INDEX = 0, ///< Visual Action Base Start Index. + VISUAL_ACTION_BASE_END_INDEX = VISUAL_ACTION_BASE_START_INDEX + 100, ///< Visual Action Base End Index. + VISUAL_ACTION_START_INDEX = VISUAL_ACTION_BASE_END_INDEX + 1, ///< Visual Action Start Index. + VISUAL_ACTION_END_INDEX = VISUAL_ACTION_START_INDEX + 100000, ///< Visual Action End Index. +}; + +/** + * @} + */ +} // namespace Toolkit + +} // namespace Dali + +#endif // DALI_TOOLKIT_ACTION_INDEX_RANGES_H diff --git a/dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h b/dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h index dbe9631..94ae63c 100644 --- a/dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h +++ b/dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_DEVEL_API_VISUALS_ANIMATED_IMAGE_VISUAL_ACTIONS_DEVEL_H /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -17,6 +17,7 @@ * limitations under the License. * */ +#include namespace Dali { @@ -34,10 +35,10 @@ namespace Action */ enum Type { - PLAY, ///< Play the animated GIF. This is also Default playback mode. - PAUSE, ///< Pause the animated GIF. - STOP, ///< Stop the animated GIF. - JUMP_TO ///< Jump to the specified frame. Property::INTEGER value should be passed. + PLAY = VISUAL_ACTION_START_INDEX, ///< Play the animated GIF. This is also Default playback mode. + PAUSE, ///< Pause the animated GIF. + STOP, ///< Stop the animated GIF. + JUMP_TO ///< Jump to the specified frame. Property::INTEGER value should be passed. }; } // namespace Action diff --git a/dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h b/dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h index 2955d17..ecb91ae 100644 --- a/dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h +++ b/dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h @@ -17,6 +17,7 @@ * limitations under the License. * */ +#include namespace Dali { @@ -34,11 +35,10 @@ namespace Action */ enum Type { - PLAY, ///< Play the animated vector image. - PAUSE, ///< Pause the animated vector image. - STOP, ///< Stop the animated vector image. This is also Default playback mode. - JUMP_TO, ///< Jump to the specified frame. Property::INTEGER value should be passed. - UPDATE_PROPERTY ///< Update the properties of the animated vector image. + PLAY = VISUAL_ACTION_START_INDEX, ///< Play the animated vector image. + PAUSE, ///< Pause the animated vector image. + STOP, ///< Stop the animated vector image. This is also Default playback mode. + JUMP_TO, ///< Jump to the specified frame. Property::INTEGER value should be passed. }; } // namespace Action diff --git a/dali-toolkit/devel-api/visuals/arc-visual-actions-devel.h b/dali-toolkit/devel-api/visuals/arc-visual-actions-devel.h deleted file mode 100644 index 9657084..0000000 --- a/dali-toolkit/devel-api/visuals/arc-visual-actions-devel.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef DALI_TOOLKIT_DEVEL_API_VISUALS_ARC_VISUAL_ACTIONS_DEVEL_H -#define DALI_TOOLKIT_DEVEL_API_VISUALS_ARC_VISUAL_ACTIONS_DEVEL_H - -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -namespace Dali -{ -namespace Toolkit -{ -namespace DevelArcVisual -{ -/** - * @brief Actions that the arc visual can perform. These actions are called through the Visual::Base::DoAction API. - */ -namespace Action -{ -/** - * @brief The available actions for this visual - */ -enum Type -{ - /** - * @brief Update the properties of the visual. - * @note DevelArcVisual::Property::THICKNESS, DevelArcVisual::Property::START_ANGLE and DevelArcVisual::Property::SWEEP_ANGLE can be updated. - */ - UPDATE_PROPERTY = 0 -}; - -} // namespace Action - -} // namespace DevelArcVisual - -} // namespace Toolkit - -} // namespace Dali - -#endif // DALI_TOOLKIT_DEVEL_API_VISUALS_ARC_VISUAL_ACTIONS_DEVEL_H diff --git a/dali-toolkit/devel-api/visuals/image-visual-actions-devel.h b/dali-toolkit/devel-api/visuals/image-visual-actions-devel.h index 89ea2d6..66b4715 100644 --- a/dali-toolkit/devel-api/visuals/image-visual-actions-devel.h +++ b/dali-toolkit/devel-api/visuals/image-visual-actions-devel.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_DEVEL_API_VISUALS_IMAGE_VISUAL_ACTIONS_DEVEL_H /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -17,6 +17,7 @@ * limitations under the License. * */ +#include namespace Dali { @@ -34,7 +35,7 @@ namespace Action */ enum Type { - RELOAD = 0 ///< Force reloading of the image, all visuals using this image will get the latest one. + RELOAD = VISUAL_ACTION_START_INDEX ///< Force reloading of the image, all visuals using this image will get the latest one. }; } // namespace Action diff --git a/dali-toolkit/devel-api/visuals/color-visual-actions-devel.h b/dali-toolkit/devel-api/visuals/visual-actions-devel.h similarity index 60% rename from dali-toolkit/devel-api/visuals/color-visual-actions-devel.h rename to dali-toolkit/devel-api/visuals/visual-actions-devel.h index 16e599a..cf74766 100644 --- a/dali-toolkit/devel-api/visuals/color-visual-actions-devel.h +++ b/dali-toolkit/devel-api/visuals/visual-actions-devel.h @@ -1,8 +1,8 @@ -#ifndef DALI_TOOLKIT_DEVEL_API_VISUALS_COLOR_VISUAL_ACTIONS_DEVEL_H -#define DALI_TOOLKIT_DEVEL_API_VISUALS_COLOR_VISUAL_ACTIONS_DEVEL_H +#ifndef DALI_TOOLKIT_DEVEL_API_VISUALS_VISUAL_ACTIONS_DEVEL_H +#define DALI_TOOLKIT_DEVEL_API_VISUALS_VISUAL_ACTIONS_DEVEL_H /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -18,14 +18,18 @@ * */ +// EXTERNAL INCLUDES +#include + namespace Dali { namespace Toolkit { -namespace DevelColorVisual +namespace DevelVisual { + /** - * @brief Actions that the color visual can perform. These actions are called through the Visual::Base::DoAction API. + * @brief Actions that the visual can perform. These actions are called through the Visual::Base::DoAction API. */ namespace Action { @@ -37,15 +41,15 @@ enum Type /** * @brief Update the properties of the visual. */ - UPDATE_PROPERTY = 0 + UPDATE_PROPERTY = VISUAL_ACTION_BASE_START_INDEX }; } // namespace Action -} // namespace DevelColorVisual +} // namespace DevelVisual } // namespace Toolkit } // namespace Dali -#endif // DALI_TOOLKIT_DEVEL_API_VISUALS_COLOR_VISUAL_ACTIONS_DEVEL_H +#endif // DALI_TOOLKIT_DEVEL_API_VISUALS_VISUAL_ACTIONS_DEVEL_H diff --git a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp index 9693cc8..d8d61d3 100644 --- a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp @@ -187,9 +187,9 @@ AnimatedImageVisual::AnimatedImageVisual(VisualFactoryCache& factoryCache, Image mUrlIndex(0), mFrameCount(0), mImageSize(), + mActionStatus(DevelAnimatedImageVisual::Action::PLAY), mWrapModeU(WrapMode::DEFAULT), mWrapModeV(WrapMode::DEFAULT), - mActionStatus(DevelAnimatedImageVisual::Action::PLAY), mStopBehavior(DevelImageVisual::StopBehavior::CURRENT_FRAME), mStartFirstFrame(false), mIsJumpTo(false) diff --git a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h index 347e9d3..1d21356 100644 --- a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h +++ b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h @@ -275,9 +275,10 @@ private: uint32_t mFrameCount; // Number of frames ImageDimensions mImageSize; + DevelAnimatedImageVisual::Action::Type mActionStatus; + Dali::WrapMode::Type mWrapModeU : 3; Dali::WrapMode::Type mWrapModeV : 3; - DevelAnimatedImageVisual::Action::Type mActionStatus : 3; DevelImageVisual::StopBehavior::Type mStopBehavior : 2; bool mStartFirstFrame : 1; bool mIsJumpTo : 1; 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 89d02e8..26495bf 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 @@ -25,6 +25,7 @@ #include // INTERNAL INCLUDES +#include #include #include #include @@ -445,15 +446,6 @@ void AnimatedVectorImageVisual::OnDoAction(const Property::Index actionId, const } break; } - case DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY: - { - const Property::Map* map = attributes.GetMap(); - if(map) - { - DoSetProperties(*map); - } - break; - } } TriggerVectorRasterization(); diff --git a/dali-toolkit/internal/visuals/arc/arc-visual.cpp b/dali-toolkit/internal/visuals/arc/arc-visual.cpp index 76328f4..a1c79e9 100644 --- a/dali-toolkit/internal/visuals/arc/arc-visual.cpp +++ b/dali-toolkit/internal/visuals/arc/arc-visual.cpp @@ -22,7 +22,6 @@ #include //INTERNAL INCLUDES -#include #include #include #include @@ -188,23 +187,6 @@ void ArcVisual::OnSetTransform() } } -void ArcVisual::OnDoAction(const Property::Index actionId, const Property::Value& attributes) -{ - // Check if action is valid for this visual type and perform action if possible - switch(actionId) - { - case DevelArcVisual::Action::UPDATE_PROPERTY: - { - const Property::Map* map = attributes.GetMap(); - if(map) - { - DoSetProperties(*map); - } - break; - } - } -} - void ArcVisual::OnInitialize() { Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY); diff --git a/dali-toolkit/internal/visuals/arc/arc-visual.h b/dali-toolkit/internal/visuals/arc/arc-visual.h index 4746351..011b946 100644 --- a/dali-toolkit/internal/visuals/arc/arc-visual.h +++ b/dali-toolkit/internal/visuals/arc/arc-visual.h @@ -107,11 +107,6 @@ protected: */ void OnSetTransform() override; - /** - * @copydoc Visual::Base::OnDoAction - */ - void OnDoAction(const Property::Index actionId, const Property::Value& attributes) override; - private: // Undefined ArcVisual(const ArcVisual& arcVisual) = delete; diff --git a/dali-toolkit/internal/visuals/color/color-visual.cpp b/dali-toolkit/internal/visuals/color/color-visual.cpp index 593eeb6..73b0931 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.cpp +++ b/dali-toolkit/internal/visuals/color/color-visual.cpp @@ -23,7 +23,6 @@ #include //INTERNAL INCLUDES -#include #include #include #include @@ -161,23 +160,6 @@ void ColorVisual::OnSetTransform() } } -void ColorVisual::OnDoAction(const Property::Index actionId, const Property::Value& attributes) -{ - // Check if action is valid for this visual type and perform action if possible - switch(actionId) - { - case DevelColorVisual::Action::UPDATE_PROPERTY: - { - const Property::Map* map = attributes.GetMap(); - if(map) - { - DoSetProperties(*map); - } - break; - } - } -} - void ColorVisual::UpdateShader() { if(mImpl->mRenderer) diff --git a/dali-toolkit/internal/visuals/color/color-visual.h b/dali-toolkit/internal/visuals/color/color-visual.h index 6ced771..5edf2ba 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.h +++ b/dali-toolkit/internal/visuals/color/color-visual.h @@ -104,11 +104,6 @@ protected: void OnSetTransform() override; /** - * @copydoc Visual::Base::OnDoAction - */ - void OnDoAction(const Property::Index actionId, const Property::Value& attributes) override; - - /** * @copydoc Visual::Base::UpdateShader */ void UpdateShader() override; diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index 443c51c..f155b86 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -25,6 +25,7 @@ #include //INTERNAL HEARDER +#include #include #include #include @@ -423,6 +424,20 @@ void Visual::Base::GetNaturalSize(Vector2& naturalSize) void Visual::Base::DoAction(const Property::Index actionId, const Property::Value attributes) { OnDoAction(actionId, attributes); + + // Check if action is valid for this visual type and perform action if possible + switch(actionId) + { + case DevelVisual::Action::UPDATE_PROPERTY: + { + const Property::Map* map = attributes.GetMap(); + if(map) + { + SetProperties(*map); + } + break; + } + } } void Visual::Base::SetDepthIndex(int index) diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 17db11b..548e45e 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include @@ -133,7 +133,7 @@ void Control::SetBackgroundColor(const Vector4& color) if(visual && visual.GetType() == Toolkit::Visual::COLOR) { // Update background color only - mImpl->DoAction(Toolkit::Control::Property::BACKGROUND, DevelColorVisual::Action::UPDATE_PROPERTY, map); + mImpl->DoAction(Toolkit::Control::Property::BACKGROUND, DevelVisual::Action::UPDATE_PROPERTY, map); return; } -- 2.7.4