From a7565e66050ade797c26effcf62761070582007a Mon Sep 17 00:00:00 2001 From: tscholb Date: Wed, 6 Oct 2021 18:04:33 +0900 Subject: [PATCH] Modified to set preview image to default value in widget I modified to turn off the default value when refactoring, but I change it for existing behavior compatibility Change-Id: I342a123e69f73ee4ab1a7bb347e159598cf45abd --- .../internal/widget_view/widget_view_impl.cpp | 23 +++++++++++-------- .../internal/widget_view/widget_view_impl.h | 5 ++-- 2 files changed, 16 insertions(+), 12 deletions(-) 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 9775817..166cb96 100644 --- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp +++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp @@ -213,7 +213,8 @@ WidgetView::WidgetView() mResizeRequired( false ), mPaused( false ), mPausedManually( false ), - mWindowVisible( true ) + mWindowVisible( true ), + mPreviewEnable( true ) { } @@ -238,7 +239,8 @@ WidgetView::WidgetView( const std::string& widgetId, const std::string& contentI mResizeRequired( false ), mPaused( false ), mPausedManually( false ), - mWindowVisible( true ) + mWindowVisible( true ), + mPreviewEnable( true ) { } @@ -403,17 +405,18 @@ bool WidgetView::CancelTouchEvent() return false; } -void WidgetView::SetPreviewVisible( bool visible ) +void WidgetView::EnablePreview( bool visible ) { - if( mPreviewImage && IsPreviewVisible() != visible ) + if( mPreviewImage && IsPreviewEnable() != visible ) { + mPreviewEnable = visible; mPreviewImage.SetProperty( Actor::Property::VISIBLE, visible ); } } -bool WidgetView::IsPreviewVisible() +bool WidgetView::IsPreviewEnable() { - return mPreviewImage.GetProperty( Actor::Property::VISIBLE ); + return mPreviewEnable; } void WidgetView::SetLoadingTextVisible( bool visible ) @@ -738,7 +741,7 @@ void WidgetView::SetProperty( BaseObject* object, Property::Index index, const P if( value.Get( previewEnabled ) ) { - impl.SetPreviewVisible( previewEnabled ); + impl.EnablePreview( previewEnabled ); } break; } @@ -845,7 +848,7 @@ Property::Value WidgetView::GetProperty( BaseObject* object, Property::Index ind } case Dali::WidgetView::WidgetView::Property::PREVIEW: { - value = impl.IsPreviewVisible(); + value = impl.IsPreviewEnable(); break; } case Dali::WidgetView::WidgetView::Property::LOADING_TEXT: @@ -1267,7 +1270,7 @@ void WidgetView::CloseRemoteSurface() void WidgetView::ShowLoadingState( bool show ) { - if( mPreviewImage && IsPreviewVisible() ) + if( mPreviewImage && IsPreviewEnable() ) { mPreviewImage.SetProperty( Actor::Property::VISIBLE, show ); } @@ -1282,7 +1285,7 @@ void WidgetView::ShowLoadingState( bool show ) void WidgetView::ShowRetryState( bool show ) { - if( mPreviewImage && IsPreviewVisible() ) + if( mPreviewImage && IsPreviewEnable() ) { mPreviewImage.SetProperty( Actor::Property::VISIBLE, false ); } 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 72de2a2..831618b 100644 --- a/widget_viewer_dali/internal/widget_view/widget_view_impl.h +++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.h @@ -141,12 +141,12 @@ public: // Internal API /** * @brief Sets the preview image is visible or not */ - void SetPreviewVisible( bool visible ); + void EnablePreview( bool visible ); /** * @brief Returns the preview visible status */ - bool IsPreviewVisible(); + bool IsPreviewEnable(); /** * @brief Sets the Loading Text is visible or not @@ -464,6 +464,7 @@ private: bool mPaused; ///< Check whether widget is paused or not bool mPausedManually; ///< Check whether widget is paused or not by application bool mWindowVisible; ///< Check whether window is visible or not + bool mPreviewEnable; ///< Check whether preview is enable or not Dali::Property::Map mEffectPropertyMap; ///< Shader for effect -- 2.34.1