X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fvisuals%2Fimage-visual-properties-devel.h;h=a10a3f814bef075813c257dafb51e01847409b35;hp=1c5451142af4b027b7e4c610881a980b885b30eb;hb=55e5ea8082729deca6f0f43f01aeae8dd51a4bdb;hpb=2c6a6697e24d39ef061f134b39f30acc5c47b0cb diff --git a/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h b/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h index 1c54511..a10a3f8 100644 --- a/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h +++ b/dali-toolkit/devel-api/visuals/image-visual-properties-devel.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_DEVEL_API_VISUALS_IMAGE_VISUAL_PROPERTIES_DEVEL_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. @@ -23,38 +23,34 @@ namespace Dali { - namespace Toolkit { - namespace DevelImageVisual { - namespace Property { - enum Type { - URL = Dali::Toolkit::ImageVisual::Property::URL, - FITTING_MODE = Dali::Toolkit::ImageVisual::Property::FITTING_MODE, - SAMPLING_MODE = Dali::Toolkit::ImageVisual::Property::SAMPLING_MODE, - DESIRED_WIDTH = Dali::Toolkit::ImageVisual::Property::DESIRED_WIDTH, - DESIRED_HEIGHT = Dali::Toolkit::ImageVisual::Property::DESIRED_HEIGHT, - SYNCHRONOUS_LOADING = Dali::Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, - BORDER_ONLY = Dali::Toolkit::ImageVisual::Property::BORDER_ONLY, - PIXEL_AREA = Dali::Toolkit::ImageVisual::Property::PIXEL_AREA, - WRAP_MODE_U = Dali::Toolkit::ImageVisual::Property::WRAP_MODE_U, - WRAP_MODE_V = Dali::Toolkit::ImageVisual::Property::WRAP_MODE_V, - BORDER = Dali::Toolkit::ImageVisual::Property::BORDER, - ATLASING = Dali::Toolkit::ImageVisual::Property::ATLASING, - ALPHA_MASK_URL = Dali::Toolkit::ImageVisual::Property::ALPHA_MASK_URL, - BATCH_SIZE = Dali::Toolkit::ImageVisual::Property::BATCH_SIZE, - CACHE_SIZE = Dali::Toolkit::ImageVisual::Property::CACHE_SIZE, - FRAME_DELAY = Dali::Toolkit::ImageVisual::Property::FRAME_DELAY, - MASK_CONTENT_SCALE = Dali::Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, - CROP_TO_MASK = Dali::Toolkit::ImageVisual::Property::CROP_TO_MASK, - LOAD_POLICY = Dali::Toolkit::ImageVisual::Property::LOAD_POLICY, - RELEASE_POLICY = Dali::Toolkit::ImageVisual::Property::RELEASE_POLICY, + URL = Dali::Toolkit::ImageVisual::Property::URL, + FITTING_MODE = Dali::Toolkit::ImageVisual::Property::FITTING_MODE, + SAMPLING_MODE = Dali::Toolkit::ImageVisual::Property::SAMPLING_MODE, + DESIRED_WIDTH = Dali::Toolkit::ImageVisual::Property::DESIRED_WIDTH, + DESIRED_HEIGHT = Dali::Toolkit::ImageVisual::Property::DESIRED_HEIGHT, + SYNCHRONOUS_LOADING = Dali::Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, + BORDER_ONLY = Dali::Toolkit::ImageVisual::Property::BORDER_ONLY, + PIXEL_AREA = Dali::Toolkit::ImageVisual::Property::PIXEL_AREA, + WRAP_MODE_U = Dali::Toolkit::ImageVisual::Property::WRAP_MODE_U, + WRAP_MODE_V = Dali::Toolkit::ImageVisual::Property::WRAP_MODE_V, + BORDER = Dali::Toolkit::ImageVisual::Property::BORDER, + ATLASING = Dali::Toolkit::ImageVisual::Property::ATLASING, + ALPHA_MASK_URL = Dali::Toolkit::ImageVisual::Property::ALPHA_MASK_URL, + BATCH_SIZE = Dali::Toolkit::ImageVisual::Property::BATCH_SIZE, + CACHE_SIZE = Dali::Toolkit::ImageVisual::Property::CACHE_SIZE, + FRAME_DELAY = Dali::Toolkit::ImageVisual::Property::FRAME_DELAY, + MASK_CONTENT_SCALE = Dali::Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, + CROP_TO_MASK = Dali::Toolkit::ImageVisual::Property::CROP_TO_MASK, + LOAD_POLICY = Dali::Toolkit::ImageVisual::Property::LOAD_POLICY, + RELEASE_POLICY = Dali::Toolkit::ImageVisual::Property::RELEASE_POLICY, ORIENTATION_CORRECTION = Dali::Toolkit::ImageVisual::Property::ORIENTATION_CORRECTION, /** @@ -86,11 +82,16 @@ enum Type /** * @brief The playing range the AnimatedVectorImageVisual will use. * - * Animation will play between the values specified. The array can only have two values, and more will be ignored. + * Animation will play between the values specified. The array can have two integer values. + * Or it can have one or two strings, which are markers. More will be ignored. * Both values should be between 0 and the total frame number, otherwise they will be ignored. * If the range provided is not in proper order ( minimum, maximum ), it will be reordered. * - * @details Name "playRange", Type Property::ARRAY of Property::INTEGER + * A marker has its start frame and end frame. + * Animation will play between the start frame and the end frame of the marker if one marker is specified. + * Or animation will play between the start frame of the first marker and the end frame of the second marker if two markers are specified. + * + * @details Name "playRange", Type Property::ARRAY of Property::INTEGER or Property::ARRAY of Property::STRING. * @note Default 0 and the total frame number. */ PLAY_RANGE = ORIENTATION_CORRECTION + 4, @@ -117,7 +118,7 @@ enum Type TOTAL_FRAME_NUMBER = ORIENTATION_CORRECTION + 7, /** - * @brief The stop behavior the AnimatedVectorImageVisual will use. + * @brief The stop behavior the AnimatedImageVisual and AnimatedVectorImageVisual will use. * @details Name "stopBehavior", Type StopBehavior::Type (Property::INTEGER) * @note Default value is StopBehavior::CURRENT_FRAME. */ @@ -137,7 +138,14 @@ enum Type * And the array contains 2 integer values which are the frame numbers, the start frame number and the end frame number of the layer. * @note This property is read-only. */ - CONTENT_INFO = ORIENTATION_CORRECTION + 10 + CONTENT_INFO = ORIENTATION_CORRECTION + 10, + + /** + * @brief Whether to redraw the image when the visual is scaled down. + * @details Name "redrawInScalingDown", type Property::BOOLEAN. + * @note It is used in the AnimatedVectorImageVisual. The default is true. + */ + REDRAW_IN_SCALING_DOWN }; } //namespace Property @@ -147,12 +155,11 @@ enum Type */ namespace PlayState { - enum Type { - STOPPED, ///< Animation has stopped - PLAYING, ///< The animation is playing - PAUSED ///< The animation is paused + STOPPED, ///< Animation has stopped + PLAYING, ///< The animation is playing + PAUSED ///< The animation is paused }; } // namespace PlayState @@ -162,26 +169,24 @@ enum Type */ namespace StopBehavior { - enum Type { - CURRENT_FRAME, ///< When the animation is stopped, the current frame is shown. - FIRST_FRAME, ///< When the animation is stopped, the first frame is shown. - LAST_FRAME ///< When the animation is stopped, the last frame is shown. + CURRENT_FRAME, ///< When the animation is stopped, the current frame is shown. + FIRST_FRAME, ///< When the animation is stopped, the first frame is shown. + LAST_FRAME ///< When the animation is stopped, the last frame is shown. }; -} // namespace StopBehavoir +} // namespace StopBehavior /** * @brief Enumeration for what looping mode is in. */ namespace LoopingMode { - enum Type { - RESTART, ///< When the animation arrives at the end in looping mode, the animation restarts from the beginning. - AUTO_REVERSE ///< When the animation arrives at the end in looping mode, the animation reverses direction and runs backwards again. + RESTART, ///< When the animation arrives at the end in looping mode, the animation restarts from the beginning. + AUTO_REVERSE ///< When the animation arrives at the end in looping mode, the animation reverses direction and runs backwards again. }; } // namespace LoopingMode