From 80ed48ecfb0778c6f9b239ee1fe9e33ce5458a65 Mon Sep 17 00:00:00 2001 From: Sunghyun Kim Date: Thu, 2 Apr 2020 15:48:30 +0900 Subject: [PATCH] Change the size of the widget when changing the size using animation Modified to change the size of the widget when changing the size using animation Change-Id: Ib1ac8ad88716759b22c94904add4922b719efe94 --- .../internal/widget_view/widget_view_impl.cpp | 6 ++++++ widget_viewer_dali/internal/widget_view/widget_view_impl.h | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp index 2a39632..cc3511c 100644 --- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp +++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp @@ -1678,6 +1678,12 @@ void WidgetView::OnRelayout( const Vector2& size, RelayoutContainer& container ) widget_instance_resize(mInstanceId.c_str(), size.x, size.y); } +void WidgetView::OnSizeAnimation( Animation& animation, const Vector3& targetSize ) +{ + Control::OnSizeAnimation( animation, targetSize ); + widget_instance_resize(mInstanceId.c_str(), targetSize.x, targetSize.y); +} + } // namespace Internal } // namespace WidgetView diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.h b/widget_viewer_dali/internal/widget_view/widget_view_impl.h index 660ba03..0911ca0 100644 --- a/widget_viewer_dali/internal/widget_view/widget_view_impl.h +++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.h @@ -275,6 +275,11 @@ private: // From Control * @copydoc Toolkit::Control::OnRelayout() */ virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ) override ; + + /** + * @copydoc Toolkit::Control::OnSizeAnimation() + */ + virtual void OnSizeAnimation( Animation& animation, const Vector3& targetSize ) override ; private: // Undefined -- 2.34.1