From 20e0863e9861749266d2c7edbfc21ac7f2de2eeb Mon Sep 17 00:00:00 2001 From: Sunghyun Kim Date: Thu, 2 Jul 2020 11:34:31 +0900 Subject: [PATCH] Revert "Apply dali2 in widget-viewer-dali" This reverts commit 2ae1e80bb70cc33711bc373e316b504eb3652c3f. Change-Id: I5641b422db895d0570f22cf19565d5e082cd21ee --- build/tizen/CMakeLists.txt | 12 +++--- packaging/widget-viewer-dali.spec | 6 +-- .../internal/widget_view/widget_view_impl.cpp | 38 +++++++++---------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index e228c41..db7f09d 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -28,9 +28,9 @@ pkg_check_modules(viewer_dali REQUIRED dlog widget_service capi-system-info - dali2-core - dali2-adaptor - dali2-toolkit + dali-core + dali-adaptor + dali-toolkit cynara-client ecore-wl2 ecore-input @@ -42,9 +42,9 @@ pkg_check_modules(viewer_dali REQUIRED dlog widget_service capi-system-info - dali2-core - dali2-adaptor - dali2-toolkit + dali-core + dali-adaptor + dali-toolkit cynara-client ecore-wayland ecore-input diff --git a/packaging/widget-viewer-dali.spec b/packaging/widget-viewer-dali.spec index 6464e4d..ff76152 100644 --- a/packaging/widget-viewer-dali.spec +++ b/packaging/widget-viewer-dali.spec @@ -16,9 +16,9 @@ BuildRequires: pkgconfig(widget_service) BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(capi-system-info) BuildRequires: pkgconfig(libtbm) -BuildRequires: pkgconfig(dali2-core) -BuildRequires: pkgconfig(dali2-adaptor) -BuildRequires: pkgconfig(dali2-toolkit) +BuildRequires: pkgconfig(dali-core) +BuildRequires: pkgconfig(dali-adaptor) +BuildRequires: pkgconfig(dali-toolkit) BuildRequires: pkgconfig(cynara-client) BuildRequires: pkgconfig(wayland-tbm-client) BuildRequires: pkgconfig(screen_connector_watcher) 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 09d7cb3..8419d1f 100644 --- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp +++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp @@ -432,7 +432,7 @@ void WidgetView::SetPreviewVisible( bool visible ) if( mPreviewImage && mPreviewVisible != visible ) { mPreviewVisible = visible; - mPreviewImage.SetProperty( Actor::Property::VISIBLE, visible ); + mPreviewImage.SetVisible( visible ); } } @@ -452,7 +452,7 @@ void WidgetView::SetLoadingTextVisible( bool visible ) mLoadingText.SetProperty( Toolkit::TextLabel::Property::TEXT, ( mLoadingTextString.empty() )? GET_LOCALE_TEXT( "IDS_ST_POP_LOADING_ING" ) : mLoadingTextString ); } - mLoadingText.SetProperty( Actor::Property::VISIBLE, visible ); + mLoadingText.SetVisible( visible ); } } @@ -467,7 +467,7 @@ void WidgetView::SetRetryTextVisible( bool visible ) mRetryText.SetProperty( Toolkit::TextLabel::Property::TEXT, ( mRetryTextString.empty() )? GET_LOCALE_TEXT( "IDS_HS_BODY_UNABLE_TO_LOAD_DATA_TAP_TO_RETRY" ) : mRetryTextString ); } - mRetryText.SetProperty( Actor::Property::VISIBLE, visible ); + mRetryText.SetVisible( visible ); } } @@ -961,30 +961,30 @@ void WidgetView::OnInitialize() mPreviewActor = Dali::Actor::New(); - mPreviewActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - mPreviewActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + mPreviewActor.SetParentOrigin( ParentOrigin::CENTER ); + mPreviewActor.SetAnchorPoint( AnchorPoint::CENTER ); mPreviewActor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mPreviewImage = Toolkit::ImageView::New( previewImage ); - mPreviewImage.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - mPreviewImage.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + mPreviewImage.SetParentOrigin( ParentOrigin::CENTER ); + mPreviewImage.SetAnchorPoint( AnchorPoint::CENTER ); mPreviewImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); Self().SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); - Self().SetProperty( Actor::Property::SIZE, Vector2(mWidth, mHeight)); + Self().SetSize( mWidth, mHeight ); Self().Add( mPreviewActor ); mPreviewActor.Add( mPreviewImage ); mStateTextActor = Dali::Actor::New(); - mStateTextActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - mStateTextActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + mStateTextActor.SetParentOrigin( ParentOrigin::CENTER ); + mStateTextActor.SetAnchorPoint( AnchorPoint::CENTER ); mStateTextActor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); // Loading text mLoadingText = Toolkit::TextLabel::New( ( mLoadingTextString.empty() )? GET_LOCALE_TEXT( "IDS_ST_POP_LOADING_ING" ) : mLoadingTextString ); - mLoadingText.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - mLoadingText.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + mLoadingText.SetParentOrigin( ParentOrigin::CENTER ); + mLoadingText.SetAnchorPoint( AnchorPoint::CENTER ); mLoadingText.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); mLoadingText.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); mLoadingText.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Dali::Color::WHITE ); @@ -996,8 +996,8 @@ void WidgetView::OnInitialize() // Retry text mRetryText = Toolkit::TextLabel::New( ( mRetryTextString.empty() )? GET_LOCALE_TEXT( "IDS_HS_BODY_UNABLE_TO_LOAD_DATA_TAP_TO_RETRY" ) : mRetryTextString ); - mRetryText.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - mRetryText.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + mRetryText.SetParentOrigin( ParentOrigin::CENTER ); + mRetryText.SetAnchorPoint( AnchorPoint::CENTER ); mRetryText.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); mRetryText.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); mRetryText.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Dali::Color::WHITE ); @@ -1005,7 +1005,7 @@ void WidgetView::OnInitialize() mRetryText.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, TextPixelToPointSize( DEFAULT_FONT_PIXEL_SIZE ) ); mStateTextActor.Add( mRetryText ); - mRetryText.SetProperty( Actor::Property::VISIBLE, false ); + mRetryText.SetVisible( false ); // launch widget mPid = widget_instance_launch( instanceId, (char *)mContentInfo.c_str(), mWidth, mHeight ); @@ -1229,14 +1229,14 @@ void WidgetView::ShowLoadingState( bool show ) { if( mPreviewImage && mPreviewVisible ) { - mPreviewImage.SetProperty( Actor::Property::VISIBLE, show ); + mPreviewImage.SetVisible( show ); } if( mLoadingText && mLoadingTextVisible ) { mLoadingText.SetProperty( Toolkit::TextLabel::Property::TEXT, ( mLoadingTextString.empty() )? GET_LOCALE_TEXT( "IDS_ST_POP_LOADING_ING" ) : mLoadingTextString ); - mLoadingText.SetProperty( Actor::Property::VISIBLE, show ); + mLoadingText.SetVisible( show ); } } @@ -1244,14 +1244,14 @@ void WidgetView::ShowRetryState( bool show ) { if( mPreviewImage && mPreviewVisible ) { - mPreviewImage.SetProperty( Actor::Property::VISIBLE, false ); + mPreviewImage.SetVisible( false ); } if( mRetryText && mRetryTextVisible ) { mRetryText.SetProperty( Toolkit::TextLabel::Property::TEXT, ( mRetryTextString.empty() )? GET_LOCALE_TEXT( "IDS_HS_BODY_UNABLE_TO_LOAD_DATA_TAP_TO_RETRY" ) : mRetryTextString ); - mRetryText.SetProperty( Actor::Property::VISIBLE, show ); + mRetryText.SetVisible( show ); mRetryState = show; } } -- 2.34.1