projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_2.3.42] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-vector-image
/
animated-vector-image-visual.h
diff --git
a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
index
e013d6c
..
183ea2c
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
+++ b/
dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_ANIMATED_VECTOR_IMAGE_VISUAL_H
/*
#define DALI_TOOLKIT_INTERNAL_ANIMATED_VECTOR_IMAGE_VISUAL_H
/*
- * Copyright (c) 202
3
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
4
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-53,7
+53,7
@@
using AnimatedVectorImageVisualPtr = IntrusivePtr<AnimatedVectorImageVisual>;
* | url | STRING |
*
*/
* | url | STRING |
*
*/
-class AnimatedVectorImageVisual : public Visual::Base, public ConnectionTracker
, public VectorAnimationManager::LifecycleObserver
+class AnimatedVectorImageVisual : public Visual::Base, public ConnectionTracker
{
public:
/**
{
public:
/**
@@
-99,12
+99,6
@@
public: // from Visual
*/
void EnablePreMultipliedAlpha(bool preMultiplied) override;
*/
void EnablePreMultipliedAlpha(bool preMultiplied) override;
-protected: // From VectorAnimationManager::LifecycleObserver:
- /**
- * @copydoc VectorAnimationManager::LifecycleObserver::VectorAnimationManagerDestroyed()
- */
- void VectorAnimationManagerDestroyed() override;
-
protected:
/**
* @brief Constructor.
protected:
/**
* @brief Constructor.
@@
-164,7
+158,7
@@
protected:
/**
* @copydoc Visual::Base::OnDoActionExtension
*/
/**
* @copydoc Visual::Base::OnDoActionExtension
*/
- void OnDoActionExtension(const Property::Index actionId,
Dali::Any
attributes) override;
+ void OnDoActionExtension(const Property::Index actionId,
const Dali::Any&
attributes) override;
private:
/**
private:
/**
@@
-182,8
+176,10
@@
private:
/**
* @brief Event callback from rasterize thread. This is called after the animation is finished.
/**
* @brief Event callback from rasterize thread. This is called after the animation is finished.
+ *
+ * @param[in] playStateId The play state id
*/
*/
- void OnAnimationFinished();
+ void OnAnimationFinished(
uint32_t playStateId
);
/**
* @brief Send animation data to the rasterize thread.
/**
* @brief Send animation data to the rasterize thread.
@@
-218,12
+214,7
@@
private:
/**
* @brief Callback when the visibility of the actor is changed.
*/
/**
* @brief Callback when the visibility of the actor is changed.
*/
- void OnControlVisibilityChanged(Actor actor, bool visible, DevelActor::VisibilityChange::Type type);
-
- /**
- * @brief Callback when the visibility of the window is changed.
- */
- void OnWindowVisibilityChanged(Window window, bool visible);
+ void OnControlInheritedVisibilityChanged(Actor actor, bool visible);
/**
* @brief Callback when the event is processed.
/**
* @brief Callback when the event is processed.
@@
-249,10
+240,16
@@
private:
WeakHandle<Actor> mPlacementActor;
DevelImageVisual::PlayState::Type mPlayState;
CallbackBase* mEventCallback; // Not owned
WeakHandle<Actor> mPlacementActor;
DevelImageVisual::PlayState::Type mPlayState;
CallbackBase* mEventCallback; // Not owned
- bool mLoadFailed;
- bool mRendererAdded;
- bool mCoreShutdown;
- bool mRedrawInScalingDown;
+ float mFrameSpeedFactor;
+
+ uint32_t mLastSentPlayStateId;
+
+ bool mLoadFailed : 1;
+ bool mRendererAdded : 1;
+ bool mRedrawInScalingDown : 1;
+ bool mEnableFrameCache : 1;
+ bool mUseNativeImage : 1;
+ bool mNotifyAfterRasterization : 1;
};
} // namespace Internal
};
} // namespace Internal