Dali:ImageActor->ImageView 08/56708/3 accepted/tizen/mobile/20160114.012846 submit/tizen_mobile/20160113.064157
authorjuhee,park <juhee82.park@samsung.com>
Tue, 12 Jan 2016 07:45:04 +0000 (16:45 +0900)
committerjuhee,park <juhee82.park@samsung.com>
Tue, 12 Jan 2016 08:09:51 +0000 (17:09 +0900)
Signed-off-by: juhee,park <juhee82.park@samsung.com>
Change-Id: I4b224b56f860686bbfdfb644697acb0f13e8d9aa

38 files changed:
cluster/box-impl.cpp
cluster/box-impl.h
cluster/cluster-impl.h
cluster/cluster-view-impl.cpp
cluster/cluster-view-impl.h
cluster/custom-box-impl.cpp
cluster/custom-box-impl.h
cluster/custom-cluster-impl.cpp
cluster/custom-cluster-page-impl.cpp
cluster/custom-cluster-page-impl.h
cluster/shader/unpremultiply-effect.cpp
cluster/shader/unpremultiply-effect.h
cluster/shader/unpremultiply-nine-patch-mask-effect.cpp
cluster/shader/unpremultiply-nine-patch-mask-effect.h
common/homescreen-badge.cpp
common/homescreen-badge.h
common/homescreen-center-popup.cpp
common/homescreen-center-popup.h
common/homescreen-page-indicator.cpp
common/homescreen-page-indicator.h
common/homescreen-view-manager.cpp
common/homescreen-view-manager.h
common/menu-popup-impl.cpp
common/menu-popup-impl.h
mainmenu/mainmenu-apps-view-impl.cpp
mainmenu/mainmenu-apps-view-impl.h
mainmenu/mainmenu-box-impl.cpp
mainmenu/mainmenu-box-impl.h
mainmenu/mainmenu-custom-box-impl.cpp
mainmenu/mainmenu-folder-box-impl.cpp
mainmenu/mainmenu-folder-box-impl.h
mainmenu/mainmenu-folder-view-impl.cpp
mainmenu/mainmenu-folder-view-impl.h
mainmenu/mainmenu-page-impl.h
util/util-color-image.cpp
util/util-color-image.h
util/util-text-image-impl.cpp
util/util-text-image-impl.h

index 59674cd..161db7b 100755 (executable)
@@ -82,14 +82,14 @@ public:
        }
 
 
-       ImageActor CreateShadow()
+       Dali::Toolkit::ImageView CreateShadow()
        {
-               ImageActor shadowImage = ImageActor::New( GetImage() );
+               Dali::Toolkit::ImageView shadowImage = Dali::Toolkit::ImageView::New( GetImage() );
                // CP.TODO: Need to have an option in DALI to not render central square of 9 patch as it's transparent anyway.
                // perhaps have a 9 bit mask to flag which sections to render and not render. This will reduce fill-rate
                // (transparent pixels still have to be processed by fragment shader)
-               shadowImage.SetStyle( ImageActor::STYLE_NINE_PATCH );
-               shadowImage.SetNinePatchBorder( mBorder );
+       //      shadowImage.SetStyle( ImageView::STYLE_NINE_PATCH );
+       //      shadowImage.SetNinePatchBorder( mBorder );
                shadowImage.SetParentOrigin( ParentOrigin::CENTER );
                shadowImage.SetAnchorPoint( AnchorPoint::CENTER );
                shadowImage.SetPosition( mPositionAdjust );
@@ -362,21 +362,21 @@ void Box::Initialize()
                 */
                if (mBoxImageType == BOX_IMAGE_BUFFER)
                {
-                       mBaseImage = ImageActor::New(mBufferImageData);
+                       mBaseImage = Dali::Toolkit::ImageView::New(mBufferImageData);
 
                        // unpremultiply
-                       mBaseImage.SetBlendFunc(Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE_MINUS_SRC_ALPHA,
-                                               Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE );
+               //      mBaseImage.SetBlendFunc(Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE_MINUS_SRC_ALPHA,
+               //                              Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE );
 
                        mBufferImageData.UploadedSignal().Connect(this, &Box::OnImageUploaded);
                }
                else if (mBoxImageType == BOX_IMAGE_PIXMAP)
                {
-                       mBaseImage = ImageActor::New(mBaseNativeImageData);
+                       mBaseImage = Dali::Toolkit::ImageView::New(mBaseNativeImageData);
 
                        // unpremultiply
-                       mBaseImage.SetBlendFunc(Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE_MINUS_SRC_ALPHA,
-                                               Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE );
+               //      mBaseImage.SetBlendFunc(Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE_MINUS_SRC_ALPHA,
+               //                              Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE );
 
                        mBaseNativeImageData.UploadedSignal().Connect(this, &Box::OnImageUploaded);
                }
@@ -436,7 +436,7 @@ void Box::Initialize()
 //     if (mBaseImageData)
 //     {
 //             Image image = ResourceImage::New(ICONDIR"/home_edit_bg.#.png");
-//             m_imageBgGrayActor = ImageActor::New(image);
+//             m_imageBgGrayActor = ImageView::New(image);
 //             m_imageBgGrayActor.SetParentOrigin(ParentOrigin::TOP_LEFT);
 //             m_imageBgGrayActor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
 //             Constraint m_imageBgSizeConstraint = Constraint::New<Vector3>( Actor::Property::SIZE, ParentSource( Actor::Property::SIZE ), EqualToConstraint() );
@@ -607,7 +607,7 @@ void Box::Update()
        }
 }
 
-void Box::ReplaceBaseImage(ImageActor& oldActor, Image& newImage, ImageActor& newActor)
+void Box::ReplaceBaseImage(Dali::Toolkit::ImageView& oldActor, Image& newImage, Dali::Toolkit::ImageView& newActor)
 {
        Actor parent = newActor.GetParent();
 
@@ -617,14 +617,14 @@ void Box::ReplaceBaseImage(ImageActor& oldActor, Image& newImage, ImageActor& ne
                oldActor = newActor;
 
                newActor.Reset();
-               newActor = ImageActor::New( newImage );
+               newActor = Dali::Toolkit::ImageView::New( newImage );
                mIsNinePatchApplied     = false ;
 
                if (mBoxImageType == BOX_IMAGE_BUFFER || mBoxImageType == BOX_IMAGE_PIXMAP)
                {
                        // unpremultiply
-                       newActor.SetBlendFunc(Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE_MINUS_SRC_ALPHA,
-                                               Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE );
+               //      newActor.SetBlendFunc(Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE_MINUS_SRC_ALPHA,
+               //                              Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE );
                }
 
                newActor.SetName("BoxImage");
@@ -662,7 +662,7 @@ void Box::ReplaceBaseImage(ImageActor& oldActor, Image& newImage, ImageActor& ne
        }
 }
 
-void Box::ReplaceBasePixmapImage(ImageActor& oldActor, Image& newImage, ImageActor& newActor)
+void Box::ReplaceBasePixmapImage(Dali::Toolkit::ImageView& oldActor, Image& newImage, Dali::Toolkit::ImageView& newActor)
 {
        Actor parent = newActor.GetParent();
 
@@ -673,15 +673,15 @@ void Box::ReplaceBasePixmapImage(ImageActor& oldActor, Image& newImage, ImageAct
                oldActor.SetOpacity(0.0f);
 
                newActor.Reset();
-               newActor = ImageActor::New( newImage );
+               newActor = Dali::Toolkit::ImageView::New( newImage );
 
                mIsNinePatchApplied     = false ;
 
                if (mBoxImageType == BOX_IMAGE_BUFFER || mBoxImageType == BOX_IMAGE_PIXMAP)
                {
                        // unpremultiply
-                       newActor.SetBlendFunc(Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE_MINUS_SRC_ALPHA,
-                                               Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE );
+//                     newActor.SetBlendFunc(Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE_MINUS_SRC_ALPHA,
+       //                                      Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE );
                }
 
                newActor.SetName("BoxImage");
index 85dd08c..beca5ae 100755 (executable)
@@ -103,8 +103,8 @@ public:
        void SetBoxFrame(const bool enabled);
 
        // update & refresh meta information of box. (Note. cluster request the box updated with this API.)
-       void ReplaceBaseImage(ImageActor& oldActor, Image& newImage, ImageActor& newActor);// It prevents flickering issue when image is changed.
-       void ReplaceBasePixmapImage(ImageActor& oldActor, Image& newImage, ImageActor& newActor);// It prevents flickering issue when image is changed.
+       void ReplaceBaseImage(Dali::Toolkit::ImageView& oldActor, Image& newImage, Dali::Toolkit::ImageView& newActor);// It prevents flickering issue when image is changed.
+       void ReplaceBasePixmapImage(Dali::Toolkit::ImageView& oldActor, Image& newImage, Dali::Toolkit::ImageView& newActor);// It prevents flickering issue when image is changed.
        void Update();
        void Update(const std::string filePath);
        void Update(const unsigned char* pBuffer, const Vector3 bufferInfo);
@@ -336,13 +336,13 @@ protected:        // member variables
        NativeImage mBaseNativeImageData;                       ///< base image loaded from pixmap
        Image mBaseDestroyImageData;            ///< temporary base image loaded from file path. It's only used when box is updated and removed.
 
-       ImageActor mBaseImage;          ///< base image actor
-       ImageActor mBaseDestroyImage;   ///< temporary base image actor. It's only used when box is updated and removed.
+       Dali::Toolkit::ImageView mBaseImage;            ///< base image actor
+       Dali::Toolkit::ImageView mBaseDestroyImage;     ///< temporary base image actor. It's only used when box is updated and removed.
 
        /*
         * For Fault
         */
-       ImageActor mFaultDim;
+       Dali::Toolkit::ImageView mFaultDim;
        bool mIsFault;
        bool mIsFaultReloading;
        Dali::Timer mFaultReloadingTimer;
@@ -420,16 +420,16 @@ protected:        // member variables
 
        Property::Index mPropertyLayoutPosition; ///< The layout position of the box
 
-       ImageActor      m_imageBgActor;
-       ImageActor      m_imageBgGrayActor;
+       Dali::Toolkit::ImageView        m_imageBgActor;
+       Dali::Toolkit::ImageView        m_imageBgGrayActor;
        Image           m_imageBg;
        bool            m_bSystemBgImage;
        Constraint                                              mScaleBgOpacityConstraint;
 
 private:
 
-       ImageActor mShadowImage;                ///< shadow image actor
-       ImageActor mShadowDragAndDropImage;     ///< shadow drag-n-drop image actor
+       Dali::Toolkit::ImageView mShadowImage;          ///< shadow image actor
+       Dali::Toolkit::ImageView mShadowDragAndDropImage;       ///< shadow drag-n-drop image actor
        Animation mShadowOpacityAnimation;      ///< animation when shadow of box appears and disappears.
 
 };
index 5a2ba38..145d015 100755 (executable)
@@ -264,7 +264,7 @@ protected:
 
        // event box
 #if _CLUSTER_DEBUG_
-       ImageActor mEventBox;
+       ImageView mEventBox;
 #else
        Actor mEventBox;
 #endif
@@ -292,7 +292,7 @@ protected:
        bool mIsBlockingOperation;
 
        // wall paper
-       ImageActor                                              mBgImageActor;
+       Dali::Toolkit::ImageView                mBgImageActor;
        Actor                                                   m_DimBgActor;
        Image                                                   mBgImage;
        Image                                                   mBgBlurredImage;
index 7f01d07..25cfb2f 100755 (executable)
@@ -256,7 +256,7 @@ void ClusterView::OnOldBgFadeOutAnimFinished(Animation&)
        // free 1st old bg actor
        if(mOldBgActors.size() > 0)
        {
-               ImageActor oldBgActor = (*mOldBgActors.begin());
+               Dali::Toolkit::ImageView oldBgActor = (*mOldBgActors.begin());
                Actor parent = oldBgActor.GetParent();
                if(parent)
                {
@@ -449,7 +449,7 @@ void ClusterView::ShowAvaliBoxGuide(CustomBoxSizeType currentBoxSize, CustomBoxS
 
        // add guide box Bg shadow
        Image guideShdow = ResourceImage::New(ICONDIR"/edit_guide_shadow.png");
-       ImageActor guideShdowImage = ImageActor::New(guideShdow);
+       Dali::Toolkit::ImageView guideShdowImage = Dali::Toolkit::ImageView::New(guideShdow);
        guideShdowImage.SetParentOrigin(ParentOrigin::BOTTOM_CENTER);
        guideShdowImage.SetAnchorPoint(AnchorPoint::BOTTOM_CENTER);
        guideShdowImage.SetZ(0.2f) ;
@@ -461,13 +461,13 @@ void ClusterView::ShowAvaliBoxGuide(CustomBoxSizeType currentBoxSize, CustomBoxS
        {
                Image image4X4 = ResourceImage::New(ICONDIR"/edit_guide.png");
                ImageDimensions size = ResourceImage::GetImageSize(ICONDIR"/edit_guide.png");
-               ImageActor giudeBox4X4 = ImageActor::New(image4X4);
+               Dali::Toolkit::ImageView giudeBox4X4 = Dali::Toolkit::ImageView::New(image4X4);
 
                giudeBox4X4.SetParentOrigin(ParentOrigin::TOP_LEFT);
                giudeBox4X4.SetAnchorPoint(AnchorPoint::TOP_LEFT);
 
-               giudeBox4X4.SetStyle(ImageActor::STYLE_NINE_PATCH);
-               giudeBox4X4.SetNinePatchBorder(Vector4(size.GetWidth() / 2 - 1, size.GetHeight() / 2 - 1, size.GetWidth() / 2 + 1, size.GetHeight() / 2 + 1));
+       //      giudeBox4X4.SetStyle(ImageView::STYLE_NINE_PATCH);
+//             giudeBox4X4.SetNinePatchBorder(Vector4(size.GetWidth() / 2 - 1, size.GetHeight() / 2 - 1, size.GetWidth() / 2 + 1, size.GetHeight() / 2 + 1));
                giudeBox4X4.SetSize(Vector2(GUIDE_BOX_4_X, GUIDE_BOX_4_Y));
 
                giudeBox4X4.SetPosition(Vector3(GUIDE_BOX_START_X,GUIDE_BOX_START_S_Y,0.0f)) ;
@@ -479,13 +479,13 @@ void ClusterView::ShowAvaliBoxGuide(CustomBoxSizeType currentBoxSize, CustomBoxS
        {
                Image image4X3 = ResourceImage::New(ICONDIR"/edit_guide.png");
                ImageDimensions size = ResourceImage::GetImageSize(ICONDIR"/edit_guide.png");
-               ImageActor guideBox4X3 = ImageActor::New(image4X3);
+               Dali::Toolkit::ImageView guideBox4X3 = Dali::Toolkit::ImageView::New(image4X3);
 
                guideBox4X3.SetParentOrigin(ParentOrigin::TOP_LEFT);
                guideBox4X3.SetAnchorPoint(AnchorPoint::TOP_LEFT);
 
-               guideBox4X3.SetStyle(ImageActor::STYLE_NINE_PATCH);
-               guideBox4X3.SetNinePatchBorder(Vector4(size.GetWidth() / 2 - 1, size.GetHeight() / 2 - 1, size.GetWidth() / 2 + 1, size.GetHeight() / 2 + 1));
+       //      guideBox4X3.SetStyle(ImageView::STYLE_NINE_PATCH);
+//             guideBox4X3.SetNinePatchBorder(Vector4(size.GetWidth() / 2 - 1, size.GetHeight() / 2 - 1, size.GetWidth() / 2 + 1, size.GetHeight() / 2 + 1));
                guideBox4X3.SetSize(Vector2(GUIDE_BOX_4_X, GUIDE_BOX_3_Y));
 
                guideBox4X3.SetPosition(Vector3(GUIDE_BOX_START_X, GUIDE_BOX_START_S_Y, 0.0f));
@@ -497,13 +497,13 @@ void ClusterView::ShowAvaliBoxGuide(CustomBoxSizeType currentBoxSize, CustomBoxS
        {
                Image image4X2 = ResourceImage::New(ICONDIR"/edit_guide.png");
                ImageDimensions size = ResourceImage::GetImageSize(ICONDIR"/edit_guide.png");
-               ImageActor giudeBox4X2 = ImageActor::New(image4X2);
+               Dali::Toolkit::ImageView giudeBox4X2 = Dali::Toolkit::ImageView::New(image4X2);
 
                giudeBox4X2.SetParentOrigin(ParentOrigin::TOP_LEFT);
                giudeBox4X2.SetAnchorPoint(AnchorPoint::TOP_LEFT);
 
-               giudeBox4X2.SetStyle(ImageActor::STYLE_NINE_PATCH);
-               giudeBox4X2.SetNinePatchBorder(Vector4(size.GetWidth() / 2 - 1, size.GetHeight() / 2 - 1, size.GetWidth() / 2 + 1, size.GetHeight() / 2 + 1));
+       //      giudeBox4X2.SetStyle(ImageView::STYLE_NINE_PATCH);
+//             giudeBox4X2.SetNinePatchBorder(Vector4(size.GetWidth() / 2 - 1, size.GetHeight() / 2 - 1, size.GetWidth() / 2 + 1, size.GetHeight() / 2 + 1));
                giudeBox4X2.SetSize(Vector2(GUIDE_BOX_4_X, GUIDE_BOX_2_Y));
 
                if ((availBoxSize & CUSTOM_BOX_SIZE_4X3) || (availBoxSize & CUSTOM_BOX_SIZE_4X4))
@@ -524,13 +524,13 @@ void ClusterView::ShowAvaliBoxGuide(CustomBoxSizeType currentBoxSize, CustomBoxS
        {
                Image image4X1 = ResourceImage::New(ICONDIR"/edit_guide.png");
                ImageDimensions size = ResourceImage::GetImageSize(ICONDIR"/edit_guide.png");
-               ImageActor giudeBox4X1 = ImageActor::New(image4X1);
+               Dali::Toolkit::ImageView giudeBox4X1 = Dali::Toolkit::ImageView::New(image4X1);
 
                giudeBox4X1.SetParentOrigin(ParentOrigin::TOP_LEFT);
                giudeBox4X1.SetAnchorPoint(AnchorPoint::TOP_LEFT);
 
-               giudeBox4X1.SetStyle(ImageActor::STYLE_NINE_PATCH);
-               giudeBox4X1.SetNinePatchBorder(Vector4(size.GetWidth() / 2 - 1, size.GetHeight() / 2 - 1, size.GetWidth() / 2 + 1, size.GetHeight() / 2 + 1));
+       //      giudeBox4X1.SetStyle(ImageView::STYLE_NINE_PATCH);
+//             giudeBox4X1.SetNinePatchBorder(Vector4(size.GetWidth() / 2 - 1, size.GetHeight() / 2 - 1, size.GetWidth() / 2 + 1, size.GetHeight() / 2 + 1));
                giudeBox4X1.SetSize(Vector2(GUIDE_BOX_4_X, GUIDE_BOX_1_Y));
 
                if ((availBoxSize & CUSTOM_BOX_SIZE_4X3) || (availBoxSize & CUSTOM_BOX_SIZE_4X4))
@@ -551,13 +551,13 @@ void ClusterView::ShowAvaliBoxGuide(CustomBoxSizeType currentBoxSize, CustomBoxS
        {
                Image image2X2 = ResourceImage::New(ICONDIR"/edit_guide.png");
                ImageDimensions size = ResourceImage::GetImageSize(ICONDIR"/edit_guide.png");
-               ImageActor giudeBox2X2 = ImageActor::New(image2X2);
+               Dali::Toolkit::ImageView giudeBox2X2 = Dali::Toolkit::ImageView::New(image2X2);
 
                giudeBox2X2.SetParentOrigin(ParentOrigin::TOP_LEFT);
                giudeBox2X2.SetAnchorPoint(AnchorPoint::TOP_LEFT);
 
-               giudeBox2X2.SetStyle(ImageActor::STYLE_NINE_PATCH);
-               giudeBox2X2.SetNinePatchBorder(Vector4(size.GetWidth() / 2 - 1, size.GetHeight() / 2 - 1, size.GetWidth() / 2 + 1, size.GetHeight() / 2 + 1));
+       //      giudeBox2X2.SetStyle(ImageView::STYLE_NINE_PATCH);
+//             giudeBox2X2.SetNinePatchBorder(Vector4(size.GetWidth() / 2 - 1, size.GetHeight() / 2 - 1, size.GetWidth() / 2 + 1, size.GetHeight() / 2 + 1));
                giudeBox2X2.SetSize(Vector2(GUIDE_BOX_2_X, GUIDE_BOX_2_Y));
 
                if ((availBoxSize & CUSTOM_BOX_SIZE_4X3) || (availBoxSize & CUSTOM_BOX_SIZE_4X4))
@@ -576,13 +576,13 @@ void ClusterView::ShowAvaliBoxGuide(CustomBoxSizeType currentBoxSize, CustomBoxS
        {
                Image image2X1 = ResourceImage::New(ICONDIR"/edit_guide.png");
                ImageDimensions size = ResourceImage::GetImageSize(ICONDIR"/edit_guide.png");
-               ImageActor giudeBox2X1 = ImageActor::New(image2X1);
+               Dali::Toolkit::ImageView giudeBox2X1 = Dali::Toolkit::ImageView::New(image2X1);
 
                giudeBox2X1.SetParentOrigin(ParentOrigin::TOP_LEFT);
                giudeBox2X1.SetAnchorPoint(AnchorPoint::TOP_LEFT);
 
-               giudeBox2X1.SetStyle(ImageActor::STYLE_NINE_PATCH);
-               giudeBox2X1.SetNinePatchBorder(Vector4(size.GetWidth() / 2 - 1, size.GetHeight() / 2 - 1, size.GetWidth() / 2 + 1, size.GetHeight() / 2 + 1));
+       //      giudeBox2X1.SetStyle(ImageView::STYLE_NINE_PATCH);
+//             giudeBox2X1.SetNinePatchBorder(Vector4(size.GetWidth() / 2 - 1, size.GetHeight() / 2 - 1, size.GetWidth() / 2 + 1, size.GetHeight() / 2 + 1));
                giudeBox2X1.SetSize(Vector2(GUIDE_BOX_2_X, GUIDE_BOX_1_Y));
 
                if ((availBoxSize & CUSTOM_BOX_SIZE_4X3) || (availBoxSize & CUSTOM_BOX_SIZE_4X4))
@@ -601,13 +601,13 @@ void ClusterView::ShowAvaliBoxGuide(CustomBoxSizeType currentBoxSize, CustomBoxS
        {
                Image image1X1 = ResourceImage::New(ICONDIR"/edit_guide.png");
                ImageDimensions size = ResourceImage::GetImageSize(ICONDIR"/edit_guide.png");
-               ImageActor giudeBox1X1 = ImageActor::New(image1X1);
+               Dali::Toolkit::ImageView giudeBox1X1 = Dali::Toolkit::ImageView::New(image1X1);
 
                giudeBox1X1.SetParentOrigin(ParentOrigin::TOP_LEFT);
                giudeBox1X1.SetAnchorPoint(AnchorPoint::TOP_LEFT);
 
-               giudeBox1X1.SetStyle(ImageActor::STYLE_NINE_PATCH);
-               giudeBox1X1.SetNinePatchBorder(Vector4(size.GetWidth() / 2 - 1, size.GetHeight() / 2 - 1, size.GetWidth() / 2 + 1, size.GetHeight() / 2 + 1));
+       //      giudeBox1X1.SetStyle(Dali::Toolkit::ImageView::STYLE_NINE_PATCH);
+//             giudeBox1X1.SetNinePatchBorder(Vector4(size.GetWidth() / 2 - 1, size.GetHeight() / 2 - 1, size.GetWidth() / 2 + 1, size.GetHeight() / 2 + 1));
                giudeBox1X1.SetSize(Vector2(GUIDE_BOX_1_X, GUIDE_BOX_1_Y));
 
                if ((availBoxSize & CUSTOM_BOX_SIZE_4X3) || (availBoxSize & CUSTOM_BOX_SIZE_4X4))
index df84778..7cc48f1 100755 (executable)
@@ -261,13 +261,13 @@ private:
        /* wallpaper */
        Layer mBgLayer;
        std::string mDefaultBgPath;
-       ImageActor mBgActor;
-       ImageActor mOldBgActor;
+       Dali::Toolkit::ImageView mBgActor;
+       Dali::Toolkit::ImageView mOldBgActor;
 
        Actor mDimBgActor;
 
        // store candidate of freed actors
-       typedef std::vector<ImageActor> OldBgContainer;
+       typedef std::vector<Dali::Toolkit::ImageView> OldBgContainer;
        OldBgContainer mOldBgActors;
 
        ClusterHome3D::Cluster mFocusedCluster;
index c3beac4..9ec2354 100755 (executable)
@@ -261,7 +261,7 @@ void CustomBox::OnInitialized()
                        {
                                image = ResourceImage::New( ICONDIR "/shortcut_bg_2x2.png" );
                        }
-                       mDimBgImage = ImageActor::New( image );
+                       mDimBgImage = Dali::Toolkit::ImageView::New( image );
                        mDimBgImage.SetParentOrigin(ParentOrigin::CENTER);
                        mDimBgImage.SetAnchorPoint(AnchorPoint::CENTER);
                        mDimBgImage.SetZ(-0.2f);
@@ -444,10 +444,10 @@ void CustomBox::CreateEditModeGUI()
                        Actor child = mDeleteButton.GetChildAt( index );
                        if ( child )
                        {
-                               ImageActor imageActor = ImageActor::DownCast( child );
+                               Dali::Toolkit::ImageView imageActor = Dali::Toolkit::ImageView::DownCast( child );
                                if(imageActor)
                                {
-                                 imageActor.SetSortModifier( -100.0f );
+                               //  imageActor.SetSortModifier( -100.0f );
                                }
                        }
                }
@@ -1136,8 +1136,8 @@ void CustomBox::Update(const CustomBoxType type, const unsigned char* pBuffer, c
        {
                if(mIsNinePatchApplied)
                {
-                       mBaseImage.RemoveShaderEffect();
-                       mBaseImage.SetStyle(ImageActor::STYLE_QUAD);
+//                     mBaseImage.RemoveShaderEffect();
+               //      mBaseImage.SetStyle(ImageView::STYLE_QUAD);
                        mIsNinePatchApplied = false;
                }
 
@@ -1273,8 +1273,8 @@ void CustomBox::Update(const CustomBoxType type, const Ecore_X_Pixmap pixmap, co
        {
                if(mIsNinePatchApplied)
                {
-                       mBaseImage.RemoveShaderEffect();
-                       mBaseImage.SetStyle(ImageActor::STYLE_QUAD);
+//     mBaseImage.RemoveShaderEffect();
+               //      mBaseImage.SetStyle(ImageView::STYLE_QUAD);
                        mIsNinePatchApplied = false;
                }
 
@@ -1425,21 +1425,21 @@ void CustomBox::RaiseTopContents(bool isRaise)
 
        if (mEditBg)
        {
-               ImageActor imageActor = ImageActor::DownCast(mEditBg);
+               Dali::Toolkit::ImageView imageActor = Dali::Toolkit::ImageView::DownCast(mEditBg);
                if (imageActor)
                {
-                       imageActor.SetSortModifier(sortValueDiv2);
+               //      imageActor.SetSortModifier(sortValueDiv2);
                }
        }
 
        if (mDimBgImage)
        {
-               mDimBgImage.SetSortModifier(sortValue);
+       //      mDimBgImage.SetSortModifier(sortValue);
        }
 
        if (mIconShadowImage)
        {
-               mIconShadowImage.SetSortModifier(sortValueDiv2);
+       //      mIconShadowImage.SetSortModifier(sortValueDiv2);
        }
 
        if(mDeleteButton)
@@ -1451,10 +1451,10 @@ void CustomBox::RaiseTopContents(bool isRaise)
                        Actor child = mDeleteButton.GetChildAt( index );
                        if ( child )
                        {
-                               ImageActor imageActor = ImageActor::DownCast( child );
+                               Dali::Toolkit::ImageView imageActor = Dali::Toolkit::ImageView::DownCast( child );
                                if(imageActor)
                                {
-                                       imageActor.SetSortModifier( -sortValue );
+                               //      imageActor.SetSortModifier( -sortValue );
                                }
                        }
                }
@@ -1462,12 +1462,12 @@ void CustomBox::RaiseTopContents(bool isRaise)
 
        if(mResizeIcon)
        {
-               mResizeIcon.SetSortModifier(-sortValue);
+       //      mResizeIcon.SetSortModifier(-sortValue);
        }
 
        if(mSelectedResizeIcon)
        {
-               mSelectedResizeIcon.SetSortModifier(-sortValue);
+       //      mSelectedResizeIcon.SetSortModifier(-sortValue);
        }
 
        // propagate it
@@ -1963,7 +1963,7 @@ void CustomBox::CreateResizeHandlerPoint(Actor aParent, bool bActivated)
 
        // left
        Image iconImage = ResourceImage::New(strFilePath);
-       ImageActor imgActorResizeIcon = ImageActor::New(iconImage);
+       Dali::Toolkit::ImageView imgActorResizeIcon = Dali::Toolkit::ImageView::New(iconImage);
        imgActorResizeIcon.SetSize(Vector2(CUSTOMBOX_RESIZE_TOUCH_ICON_SIZE_W, CUSTOMBOX_RESIZE_TOUCH_ICON_SIZE_H));
        imgActorResizeIcon.SetAnchorPoint(AnchorPoint::CENTER_LEFT);
        imgActorResizeIcon.SetParentOrigin(ParentOrigin::CENTER_LEFT);
@@ -1972,7 +1972,7 @@ void CustomBox::CreateResizeHandlerPoint(Actor aParent, bool bActivated)
        aParent.Add(imgActorResizeIcon);
 
        // top
-       imgActorResizeIcon = ImageActor::New(iconImage);
+       imgActorResizeIcon = Dali::Toolkit::ImageView::New(iconImage);
        imgActorResizeIcon.SetSize(Vector2(CUSTOMBOX_RESIZE_TOUCH_ICON_SIZE_W, CUSTOMBOX_RESIZE_TOUCH_ICON_SIZE_H));
        imgActorResizeIcon.SetAnchorPoint(AnchorPoint::TOP_CENTER);
        imgActorResizeIcon.SetParentOrigin(ParentOrigin::TOP_CENTER);
@@ -1981,7 +1981,7 @@ void CustomBox::CreateResizeHandlerPoint(Actor aParent, bool bActivated)
        aParent.Add(imgActorResizeIcon);
 
        // right
-       imgActorResizeIcon = ImageActor::New(iconImage);
+       imgActorResizeIcon = Dali::Toolkit::ImageView::New(iconImage);
        imgActorResizeIcon.SetSize(Vector2(CUSTOMBOX_RESIZE_TOUCH_ICON_SIZE_W, CUSTOMBOX_RESIZE_TOUCH_ICON_SIZE_H));
        imgActorResizeIcon.SetAnchorPoint(AnchorPoint::CENTER_RIGHT);
        imgActorResizeIcon.SetParentOrigin(ParentOrigin::CENTER_RIGHT);
@@ -1989,7 +1989,7 @@ void CustomBox::CreateResizeHandlerPoint(Actor aParent, bool bActivated)
 
        aParent.Add(imgActorResizeIcon);
 
-       imgActorResizeIcon = ImageActor::New(iconImage);
+       imgActorResizeIcon = Dali::Toolkit::ImageView::New(iconImage);
        imgActorResizeIcon.SetSize(Vector2(CUSTOMBOX_RESIZE_TOUCH_ICON_SIZE_W, CUSTOMBOX_RESIZE_TOUCH_ICON_SIZE_H));
        imgActorResizeIcon.SetAnchorPoint(AnchorPoint::BOTTOM_CENTER);
        imgActorResizeIcon.SetParentOrigin(ParentOrigin::BOTTOM_CENTER);
@@ -2044,10 +2044,10 @@ void CustomBox::SetEnabledDisplayResizeMode(void)
                /* border image */
                Image iconImage = ResourceImage::New(ICONDIR"/edit_home_handler_stroke_activated.#.png");
                ImageDimensions iconSize = ResourceImage::GetImageSize(ICONDIR"/edit_home_handler_stroke_activated.#.png");
-               mResizeAreaAvailable = ImageActor::New(iconImage);
+               mResizeAreaAvailable = Dali::Toolkit::ImageView::New(iconImage);
 
-               mResizeAreaAvailable.SetStyle(ImageActor::STYLE_NINE_PATCH);
-               mResizeAreaAvailable.SetNinePatchBorder(Vector4(iconSize.GetWidth() / 2 - 1, iconSize.GetHeight() / 2 - 1, iconSize.GetWidth() / 2 + 1, iconSize.GetHeight() / 2 + 1));
+       //      mResizeAreaAvailable.SetStyle(Dali::Toolkit::ImageView::STYLE_NINE_PATCH);
+//             mResizeAreaAvailable.SetNinePatchBorder(Vector4(iconSize.GetWidth() / 2 - 1, iconSize.GetHeight() / 2 - 1, iconSize.GetWidth() / 2 + 1, iconSize.GetHeight() / 2 + 1));
 
                mResizeAreaAvailable.SetAnchorPoint(AnchorPoint::CENTER);
                mResizeAreaAvailable.SetParentOrigin(ParentOrigin::CENTER);
@@ -2187,8 +2187,8 @@ void CustomBox::SetEnabledDisplayResizeMode(void)
 
                // size control not available
                iconImage = ResourceImage::New(ICONDIR"/edit_home_handler_stroke_limited.#.png");
-               mResizeAreaUnavailable = ImageActor::New(iconImage);
-               mResizeAreaUnavailable.SetStyle(ImageActor::STYLE_NINE_PATCH);
+               mResizeAreaUnavailable = Dali::Toolkit::ImageView::New(iconImage);
+       //      mResizeAreaUnavailable.SetStyle(Dali::Toolkit::ImageView::STYLE_NINE_PATCH);
                mResizeAreaUnavailable.SetSize(Scalable::GetSize(Vector2(0.0f, 0.0f)));
                mResizeAreaUnavailable.SetAnchorPoint(AnchorPoint::TOP_LEFT);
                mResizeAreaUnavailable.SetParentOrigin(ParentOrigin::TOP_LEFT);
@@ -2251,8 +2251,8 @@ void CustomBox::CreateResizeUnavaiableGui4FixedSize(void)
 
        if(!mResizeAreaUnavailable)
        {
-               mResizeAreaUnavailable = ImageActor::New(iconImage);
-               mResizeAreaUnavailable.SetStyle(ImageActor::STYLE_NINE_PATCH);
+               mResizeAreaUnavailable = Dali::Toolkit::ImageView::New(iconImage);
+       //      mResizeAreaUnavailable.SetStyle(Dali::Toolkit::ImageView::STYLE_NINE_PATCH);
                mResizeAreaUnavailable.SetSize(Scalable::GetSize(Vector2(0.0f, 0.0f)));
                mResizeAreaUnavailable.SetAnchorPoint(AnchorPoint::TOP_LEFT);
                mResizeAreaUnavailable.SetParentOrigin(ParentOrigin::TOP_LEFT);
index 62b9338..a7beb9b 100755 (executable)
@@ -387,10 +387,10 @@ protected:
         * actors
         */
        Actor mEditBg;          ///>    background of edit mode
-       ImageActor mEditOutline;        ///> Outline of edit mode
-       ImageActor mDimBgImage; ///>    dimmed icon bg image actor
-       ImageActor mIconShadowImage;    ///> icon shadow image actor
-       ImageActor mBadgeBGImage ;      ///> badge image actor
+       Dali::Toolkit::ImageView mEditOutline;  ///> Outline of edit mode
+       Dali::Toolkit::ImageView mDimBgImage;   ///>    dimmed icon bg image actor
+       Dali::Toolkit::ImageView mIconShadowImage;      ///> icon shadow image actor
+       Dali::Toolkit::ImageView mBadgeBGImage ;        ///> badge image actor
 
        // picking event box
        Actor mPickEventBox;    ///> picking event box as same as box size
@@ -401,15 +401,15 @@ protected:
        // resize box icon
        Actor mResizeContainer;
        Actor mFixedResizeContainer;
-       ImageActor mResizeArea; ///> this area indicates that how big is resize. (red color)
-       ImageActor mResizeAreaAvailable;
-       ImageActor mResizeAreaUnavailable;      ///> this area is diaplyed when the box is no more resized.
-       ImageActor mResizeAreaUnavailableTension;       ///> this background of area is diaplyed when the box is no more resized.
-       ImageActor mResizeDimRight;     ///> right part of dim area when box is resized.
-       ImageActor mResizeDimBottom;    ///> bottom part of dim area when box is resized.
-       ImageActor mResizeIcon; ///> resize icon
+       Dali::Toolkit::ImageView mResizeArea;   ///> this area indicates that how big is resize. (red color)
+       Dali::Toolkit::ImageView mResizeAreaAvailable;
+       Dali::Toolkit::ImageView mResizeAreaUnavailable;        ///> this area is diaplyed when the box is no more resized.
+       Dali::Toolkit::ImageView mResizeAreaUnavailableTension; ///> this background of area is diaplyed when the box is no more resized.
+       Dali::Toolkit::ImageView mResizeDimRight;       ///> right part of dim area when box is resized.
+       Dali::Toolkit::ImageView mResizeDimBottom;      ///> bottom part of dim area when box is resized.
+       Dali::Toolkit::ImageView mResizeIcon;   ///> resize icon
        Actor mResizeEventBox;  ///> resize event box, a little bigger than resize icon
-       ImageActor mSelectedResizeIcon;
+       Dali::Toolkit::ImageView mSelectedResizeIcon;
 
        Actor mResizeTouchEventArea;
 
@@ -425,7 +425,7 @@ protected:
 
        Actor mCurResizeTouchEventArea;                 // remember current resize event area
 
-       ImageActor mResizableShadow;
+       Dali::Toolkit::ImageView mResizableShadow;
 
        TapGestureDetector mTapDetector;
        LongPressGestureDetector m_BoxLongpressDetector;
index 3ca4b96..3043712 100755 (executable)
@@ -645,7 +645,7 @@ void CustomCluster::OnInitialize()
        mPickedBoxDraggedTimer.TickSignal().Connect(this, &Internal::CustomCluster::OnPickedBoxDraggedTimerComplete);
 
        // create transparent image
-       ImageActor switchImage = CreateSolidColorActor(Vector4(0.0f / 255.0f, 176.0f / 255.0f, 240.0f / 255.0f, 1.0f));
+       Dali::Toolkit::ImageView switchImage = CreateSolidColorActor(Vector4(0.0f / 255.0f, 176.0f / 255.0f, 240.0f / 255.0f, 1.0f));
 
        switchImage.SetParentOrigin( ParentOrigin::CENTER );
        switchImage.SetAnchorPoint( AnchorPoint::CENTER );
@@ -2239,9 +2239,9 @@ void CustomCluster::SetWallpaper(Dali::Image image, Image blurredImage, bool bSy
        mBgBlurredImage = blurredImage;
        m_bSystemBgImage = bSystemBgImage;
 
-       mBgImageActor = ImageActor::New(mBgImage);
+       mBgImageActor = Dali::Toolkit::ImageView::New(mBgImage);
        mEffect = ImageRegionEffect::Create();
-       mBgImageActor.SetShaderEffect(mEffect);
+//     mBgImageActor.SetShaderEffect(mEffect);
        mBgImageActor.SetParentOrigin(ParentOrigin::TOP_LEFT);
        mBgImageActor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
        mBgImageActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
@@ -2493,11 +2493,11 @@ void CustomCluster::SwitchAllPageView(bool isShowAllPage, unsigned int nPage)
 
                        Dali::Image image = Dali::ResourceImage::New(ICONDIR"/edit_all_page_add.png");
 
-                       Dali::ImageActor normalBg = Dali::ImageActor::New(image);
+                       Dali::Toolkit::ImageView normalBg = Dali::Toolkit::ImageView::New(image);
 
                        image = Dali::ResourceImage::New(ICONDIR"/edit_all_page_add_press.png");
 
-                       Dali::ImageActor pressBg = Dali::ImageActor::New(image);
+                       Dali::Toolkit::ImageView pressBg = Dali::Toolkit::ImageView::New(image);
 
                        mAddPageButton.SetSize(CC_ALLPAGE_BUTTON_W, CC_ALLPAGE_BUTTON_H);
                        mAddPageButton.SetButtonImage(normalBg);
index 8b3ad41..ff8ea23 100755 (executable)
@@ -166,15 +166,15 @@ void CustomClusterPage::Initialize()
        // glass image
        Image bgImage = ResourceImage::New(ICONDIR"/glass_bg_C.9.png");
        ImageDimensions imageSize = ResourceImage::GetImageSize(ICONDIR"/glass_bg_C.9.png");
-       mGlassImage = ImageActor::New(bgImage);
-       mGlassImage.SetStyle( ImageActor::STYLE_NINE_PATCH );
-       mGlassImage.SetNinePatchBorder( Vector4(imageSize.GetWidth()/2-1, imageSize.GetHeight()/2-1, imageSize.GetWidth()/2+1, imageSize.GetHeight()/2+1) );
+       mGlassImage = ImageView::New(bgImage);
+//     mGlassImage.SetStyle( ImageView::STYLE_NINE_PATCH );
+//     mGlassImage.SetNinePatchBorder( Vector4(imageSize.GetWidth()/2-1, imageSize.GetHeight()/2-1, imageSize.GetWidth()/2+1, imageSize.GetHeight()/2+1) );
 
        mGlassImage.SetAnchorPoint(AnchorPoint::CENTER);
        mGlassImage.SetParentOrigin(ParentOrigin::CENTER);
        mGlassImage.SetPosition(0.0f, -16.0f, 0.0f);
        mGlassImage.SetSize((CLUSTER_HOME_WIDTH), (CLUSTER_HOME_VIEW_HEIGHT + 30) );
-       mGlassImage.SetSortModifier(1000.0f); // make it behind
+//     mGlassImage.SetSortModifier(1000.0f); // make it behind
 
        mSourceActor.Add(mGlassImage);
 
@@ -204,7 +204,7 @@ void CustomClusterPage::Initialize()
        // shadow
        mShadowBgImage = ResourceImage::New(ICONDIR"/edit_home_pages_bg.png");
        mPickedShadowBgImage = ResourceImage::New(ICONDIR"/edit_home_pages_bg_drag.png");
-       mShadowImage = ImageActor::New(mShadowBgImage);
+       mShadowImage = ImageView::New(mShadowBgImage);
        mShadowImage.SetScale(1.0f / CC_ALLPAGE_SCALE);
 
        mShadowImage.SetSize(CC_ALLPAGE_W, CC_ALLPAGE_H);
@@ -828,7 +828,7 @@ void CustomClusterPage::SetEditModeBg( bool isAutoAddPageMode )
 
                // edit mode bg
                float bgY = CC_GRID_EDIT_Y; //GUI said: 90 = 52 + 38
-               mEditModePageBg = ImageActor::New( bgImage );
+               mEditModePageBg = ImageView::New( bgImage );
                mEditModePageBg.SetAnchorPoint(AnchorPoint::TOP_CENTER);
                mEditModePageBg.SetParentOrigin(ParentOrigin::TOP_CENTER);
                mEditModePageBg.SetSize(Vector2(CC_EDIT_PAGE_W, CC_EDIT_PAGE_H)); // GUI said: 420.0f
@@ -842,7 +842,7 @@ void CustomClusterPage::SetEditModeBg( bool isAutoAddPageMode )
                mEditModeAddButton.SetSize(CLUSTER_ADD_BUTTON_PAGE_ADD_BUTTON_WIDTH, CLUSTER_ADD_BUTTON_PAGE_ADD_BUTTON_HEIGHT);
                mEditModeAddButton.SetZ(1.0f);
 
-               ImageActor editModeAddButtonImage = ImageActor::New( addImage );
+               ImageView editModeAddButtonImage = ImageView::New( addImage );
                editModeAddButtonImage.SetAnchorPoint(AnchorPoint::CENTER);
                editModeAddButtonImage.SetParentOrigin(ParentOrigin::CENTER);
                editModeAddButtonImage.SetSize(CLUSTER_ADD_BUTTON_PAGE_ADD_BUTTON_WIDTH, CLUSTER_ADD_BUTTON_PAGE_ADD_BUTTON_HEIGHT);
index 96e1665..70a91d9 100755 (executable)
@@ -193,16 +193,16 @@ protected:        // member variables
        bool mIsDeleteButtonEnabled;
        Actor mPickEventBox;
 
-       Dali::ImageActor mEditModePageBg;
+       Dali::Toolkit::ImageView mEditModePageBg;
        bool mIsDeletePageButtonEnabled;
 
        Dali::Toolkit::PushButton mEditModeAddButton;
 
-       ImageActor mGlassImage;
+       Dali::Toolkit::ImageView mGlassImage;
        Constraint mGlassColorConstraint;
        bool mShowGlassImage;
 
-       ImageActor mShadowImage;
+       Dali::Toolkit::ImageView mShadowImage;
 
        /*
         * Gesture Detector
index ce5cf03..65db662 100755 (executable)
@@ -26,7 +26,7 @@ namespace ClusterHome3D
 namespace UnpremultiplyEffect
 {
 
-void Apply( ImageActor actor )
+void Apply( Dali::Toolkit::ImageView actor )
 {
   /**
    * This fragment shader operates for premultiplied source image.
@@ -43,7 +43,7 @@ void Apply( ImageActor actor )
                                                UNPREMULTIPLY_FRAGMENT_SHADER_SOURCE,
                                                ShaderEffect::GeometryHints( ShaderEffect::HINT_BLENDING ) );
 
-  actor.SetShaderEffect( maskEffect );
+//  actor.SetShaderEffect( maskEffect );
 }
 
 } // namespace UnpremultiplyEffect
index 75cc7b9..e305de6 100755 (executable)
@@ -22,6 +22,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/dali.h>
+#include <dali-toolkit/dali-toolkit.h>
 
 using namespace std;
 using namespace Dali;
@@ -35,7 +36,7 @@ namespace ClusterHome3D
  * Usage example:
  *
  * @code
- *   ImageActor actor = ImageActor::New( Image( EXAMPLE_IMAGE_PATH ) );
+ *   ImageView actor = ImageView::New( Image( EXAMPLE_IMAGE_PATH ) );
  *   UnpremultiplyEffect::Apply( actor );
  * @endcode
  *
@@ -44,11 +45,11 @@ namespace UnpremultiplyEffect
 {
 
 /**
- * @brief Apply the unpremultiply operation to an ImageActor.
+ * @brief Apply the unpremultiply operation to an ImageView.
  *
  * @param [in] actor The actor which needs the effect. To remove the effect call actor.RemoveShaderEffect().
  */
-void Apply( ImageActor actor );
+void Apply( Dali::Toolkit::ImageView actor );
 
 } // namespace UnpremultiplyEffect
 
index 26872d7..3988419 100755 (executable)
@@ -35,7 +35,7 @@ struct UnpremultiplyNinePatchMaskEffectSizeConstraint
   }
 };
 
-static void DoApply( ImageActor actor, const std::string& maskImage, const Vector2& maskSize, Vector4 maskBorder )
+static void DoApply( Dali::Toolkit::ImageView actor, const std::string& maskImage, const Vector2& maskSize, Vector4 maskBorder )
 {
   const char* ALPHA_MASK_VERTEX_SHADER_SOURCE =
   "uniform vec2 uImageSize;                                                       \n"
@@ -93,13 +93,13 @@ static void DoApply( ImageActor actor, const std::string& maskImage, const Vecto
   maskEffect.SetUniform( "uMaskSize", maskSize );
 
   // Actor must provide nine-patch style geometry for this effect to work
-  actor.SetStyle( ImageActor::STYLE_NINE_PATCH );
-  actor.SetNinePatchBorder( maskBorder );
+//  actor.SetStyle( ImageView::STYLE_NINE_PATCH );
+//  actor.SetNinePatchBorder( maskBorder );
 
-  actor.SetShaderEffect( maskEffect );
+//  actor.SetShaderEffect( maskEffect );
 }
 
-void Apply( ImageActor actor, const std::string& maskImage )
+void Apply( Dali::Toolkit::ImageView actor, const std::string& maskImage )
 {
   ImageDimensions size = ResourceImage::GetImageSize( maskImage );
   Vector2 maskSize( size.GetWidth(), size.GetHeight() );
@@ -110,7 +110,7 @@ void Apply( ImageActor actor, const std::string& maskImage )
   DoApply( actor, maskImage, maskSize, Vector4( leftRight, topBottom, leftRight, topBottom ) );
 }
 
-void Apply( ImageActor actor, const std::string& maskImage, const Vector4& maskBorder )
+void Apply(Dali::Toolkit::ImageView actor, const std::string& maskImage, const Vector4& maskBorder )
 {
   ImageDimensions size = ResourceImage::GetImageSize( maskImage );
   Vector2 maskSize( size.GetWidth(), size.GetHeight() );
index 36590eb..a402e0c 100755 (executable)
@@ -23,6 +23,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/dali.h>
+#include <dali-toolkit/dali-toolkit.h>
+
 
 using namespace std;
 using namespace Dali;
@@ -39,33 +41,33 @@ namespace ClusterHome3D
  * Usage example:
  *
  * @code
- *   ImageActor actor = ImageActor::New( Image( EXAMPLE_IMAGE_PATH ) );
+ *   ImageView actor = ImageView::New( Image( EXAMPLE_IMAGE_PATH ) );
  *   UnpremultiplyNinePatchMaskEffect::Apply( actor, MASK_IMAGE_PATH );
  * @endcode
  *
- * UnpremultiplyNinePatchMaskEffect is mutually exclusive with ImageActor::STYLE_NINE_PATCH i.e. the actor's main image should not be a nine-patch.
+ * UnpremultiplyNinePatchMaskEffect is mutually exclusive with ImageView::STYLE_NINE_PATCH i.e. the actor's main image should not be a nine-patch.
  */
 namespace UnpremultiplyNinePatchMaskEffect
 {
 
 /**
- * @brief Apply the mask effect to an ImageActor.
+ * @brief Apply the mask effect to an ImageView.
  *
- * UnpremultiplyNinePatchMaskEffect is mutually exclusive with ImageActor::STYLE_NINE_PATCH i.e. the actor's main image should not be a nine-patch.
+ * UnpremultiplyNinePatchMaskEffect is mutually exclusive with ImageView::STYLE_NINE_PATCH i.e. the actor's main image should not be a nine-patch.
  * @param [in] actor The actor which needs the effect. To remove the effect call actor.RemoveShaderEffect().
  * @param [in] maskImage The path to a file containing the mask. The center pixels of the mask will be stretched.
  */
-void Apply( ImageActor actor, const std::string& maskImage );
+void Apply( Dali::Toolkit::ImageView actor, const std::string& maskImage );
 
 /**
- * @brief Apply the mask effect to an ImageActor.
+ * @brief Apply the mask effect to an ImageView.
  *
- * UnpremultiplyNinePatchMaskEffect is mutually exclusive with ImageActor::STYLE_NINE_PATCH i.e. the actor's main image should not be a nine-patch.
+ * UnpremultiplyNinePatchMaskEffect is mutually exclusive with ImageView::STYLE_NINE_PATCH i.e. the actor's main image should not be a nine-patch.
  * @param [in] actor The actor which needs the effect. To remove the effect call actor.RemoveShaderEffect().
  * @param [in] maskImage The path to a file containing the mask.
  * @param [in] maskBorder Specifies the part of the mask image that will be stretched (left, top, right, bottom).
  */
-void Apply( ImageActor actor, const std::string& maskImage, const Vector4& maskBorder );
+void Apply( Dali::Toolkit::ImageView actor, const std::string& maskImage, const Vector4& maskBorder );
 
 } // namespace UnpremultiplyNinePatchMaskEffect
 
index a84e853..54b646a 100755 (executable)
@@ -60,12 +60,12 @@ CHomeScreenBadge::CHomeScreenBadge(BadgeType eBadgeType, unsigned int nCount) :
   ImageDimensions dimensions = ResourceImage::GetImageSize(ICONDIR"/B08_noti_bubble_bg.#.png");
   Vector2 vt2Size( dimensions.GetWidth(), dimensions.GetHeight() );
 
-  m_aBgImage = ImageActor::New(hImage);
+  m_aBgImage = Dali::Toolkit::ImageView::New(hImage);
   m_aBgImage.SetParentOrigin(ParentOrigin::CENTER);
   m_aBgImage.SetAnchorPoint(AnchorPoint::CENTER);
 
 m_aBgImage.SetStyle(ImageActor::STYLE_NINE_PATCH);
-  m_aBgImage.SetNinePatchBorder(Vector4(vt2Size.width / 2 - 2, vt2Size.height / 2 - 2 , vt2Size.width / 2 , vt2Size.height / 2 ));
// m_aBgImage.SetStyle(ImageView::STYLE_NINE_PATCH);
+//  m_aBgImage.SetNinePatchBorder(Vector4(vt2Size.width / 2 - 2, vt2Size.height / 2 - 2 , vt2Size.width / 2 , vt2Size.height / 2 ));
 
        //m_aBgImage.SetOpacity(0.0f);
 
index a7a7206..e64a070 100755 (executable)
@@ -54,7 +54,7 @@ private:
        bool m_bVisible;
 
        Dali::Actor m_aContainer;
-       Dali::ImageActor m_aBgImage;
+       Dali::Toolkit::ImageView m_aBgImage;
 
        Dali::Toolkit::TextLabel m_aCountText;
 
index ba676cd..20317d7 100755 (executable)
@@ -377,9 +377,9 @@ unsigned int CHomeScreenCenterPopup::AddListItem(std::string strLabel)
        aPushButton.SetParentOrigin(ParentOrigin::TOP_LEFT);
 
        Dali::Actor aNormalBg = Actor::New();
-       Dali::ImageActor aPressBg = CreateSolidColorActor(CENTER_POPUP_ITEM_BG_PRESSED_COLOR_THEME_COLOR);
+       Dali::Toolkit::ImageView aPressBg = CreateSolidColorActor(CENTER_POPUP_ITEM_BG_PRESSED_COLOR_THEME_COLOR);
 
-       Dali::ImageActor aNormalBgImage = CreateSolidColorActor(CENTER_POPUP_ITEM_BG_NORMAL_COLOR_THEME_COLOR);
+       Dali::Toolkit::ImageView aNormalBgImage = CreateSolidColorActor(CENTER_POPUP_ITEM_BG_NORMAL_COLOR_THEME_COLOR);
        // Set gradation style for menu popup
        aNormalBgImage.SetOpacity(0.04f*nId);
        aNormalBgImage.SetAnchorPoint(AnchorPoint::CENTER);
@@ -510,9 +510,9 @@ unsigned int CHomeScreenCenterPopup::AddListItem(std::string strLabel, bool bSel
        aPushButton.SetParentOrigin(ParentOrigin::TOP_LEFT);
 
        Dali::Actor aNormalBg = Actor::New();
-       Dali::ImageActor aPressBg = CreateSolidColorActor(CENTER_POPUP_ITEM_BG_PRESSED_COLOR_THEME_COLOR);
+       Dali::Toolkit::ImageView aPressBg = CreateSolidColorActor(CENTER_POPUP_ITEM_BG_PRESSED_COLOR_THEME_COLOR);
 
-       Dali::ImageActor aNormalBgImage =CreateSolidColorActor(CENTER_POPUP_ITEM_BG_NORMAL_COLOR_THEME_COLOR);
+       Dali::Toolkit::ImageView aNormalBgImage =CreateSolidColorActor(CENTER_POPUP_ITEM_BG_NORMAL_COLOR_THEME_COLOR);
        // Set gradation style for menu popup
        aNormalBgImage.SetOpacity(0.04f*nId);
        aNormalBgImage.SetAnchorPoint(AnchorPoint::CENTER);
@@ -555,7 +555,7 @@ unsigned int CHomeScreenCenterPopup::AddListItem(std::string strLabel, bool bSel
        aRadioNormal.SetSize(CENTER_POPUP_LIST_RADIO_BUTTON_SIZE_W, CENTER_POPUP_LIST_RADIO_BUTTON_SIZE_H);
        aRadioNormal.SetPosition(fRadioX, 0.0f, fZ);
 
-       ImageActor aRadioNormalBg = ImageActor::New(radioBgImage);
+       Dali::Toolkit::ImageView aRadioNormalBg = Dali::Toolkit::ImageView::New(radioBgImage);
        aRadioNormalBg.SetAnchorPoint(AnchorPoint::CENTER);
        aRadioNormalBg.SetParentOrigin(ParentOrigin::CENTER);
        aRadioNormalBg.SetZ(fZ);
@@ -564,7 +564,7 @@ unsigned int CHomeScreenCenterPopup::AddListItem(std::string strLabel, bool bSel
        aRadioNormal.Add(aRadioNormalBg);
 
        fZ = fZ + 0.01f;
-       ImageActor aRadioNormalBgStroke = ImageActor::New(radioBgStrokeImage);
+       Dali::Toolkit::ImageView aRadioNormalBgStroke = Dali::Toolkit::ImageView::New(radioBgStrokeImage);
        aRadioNormalBgStroke.SetAnchorPoint(AnchorPoint::CENTER);
        aRadioNormalBgStroke.SetParentOrigin(ParentOrigin::CENTER);
        aRadioNormalBgStroke.SetZ(fZ);
@@ -581,7 +581,7 @@ unsigned int CHomeScreenCenterPopup::AddListItem(std::string strLabel, bool bSel
        aRadioNormalActivateContainer.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
 
        fZ = fZ + 0.01f;
-       ImageActor aRadioNormalActivate = ImageActor::New(radioBgImage);
+       Dali::Toolkit::ImageView aRadioNormalActivate = Dali::Toolkit::ImageView::New(radioBgImage);
        aRadioNormalActivate.SetAnchorPoint(AnchorPoint::CENTER);
        aRadioNormalActivate.SetParentOrigin(ParentOrigin::CENTER);
        aRadioNormalActivate.SetZ(fZ);
@@ -589,7 +589,7 @@ unsigned int CHomeScreenCenterPopup::AddListItem(std::string strLabel, bool bSel
        aRadioNormalActivate.SetColor(CENTER_POPUP_RADIO_BUTTON_BG_ON_THEME_COLOR);
 
        fZ = fZ + 0.01f;
-       ImageActor aRadioNormalActivateShadow = ImageActor::New(radioActiveImage);
+       Dali::Toolkit::ImageView aRadioNormalActivateShadow = Dali::Toolkit::ImageView::New(radioActiveImage);
        aRadioNormalActivateShadow.SetAnchorPoint(AnchorPoint::CENTER);
        aRadioNormalActivateShadow.SetParentOrigin(ParentOrigin::CENTER);
        aRadioNormalActivateShadow.SetColor(CENTER_POPUP_RADIO_BUTTON_NORMAL_THEME_COLOR);
@@ -619,7 +619,7 @@ unsigned int CHomeScreenCenterPopup::AddListItem(std::string strLabel, bool bSel
        aRadioPress.SetSize(CENTER_POPUP_LIST_RADIO_BUTTON_SIZE_W, CENTER_POPUP_LIST_RADIO_BUTTON_SIZE_H);
        aRadioPress.SetPosition(fRadioX, 0.0f, fZ);
 
-       ImageActor aRadioPressBg = ImageActor::New(radioBgImage);
+       Dali::Toolkit::ImageView aRadioPressBg = Dali::Toolkit::ImageView::New(radioBgImage);
        aRadioPressBg.SetAnchorPoint(AnchorPoint::CENTER_LEFT);
        aRadioPressBg.SetParentOrigin(ParentOrigin::CENTER_LEFT);
        aRadioPressBg.SetZ(fZ);
@@ -628,7 +628,7 @@ unsigned int CHomeScreenCenterPopup::AddListItem(std::string strLabel, bool bSel
        aRadioPress.Add(aRadioPressBg);
 
        fZ = fZ + 0.01f;
-       ImageActor aRadioPressBgStroke = ImageActor::New(radioBgStrokeImage);
+       Dali::Toolkit::ImageView aRadioPressBgStroke = Dali::Toolkit::ImageView::New(radioBgStrokeImage);
        aRadioPressBgStroke.SetAnchorPoint(AnchorPoint::CENTER);
        aRadioPressBgStroke.SetParentOrigin(ParentOrigin::CENTER);
        aRadioPressBgStroke.SetZ(fZ);
@@ -644,7 +644,7 @@ unsigned int CHomeScreenCenterPopup::AddListItem(std::string strLabel, bool bSel
        aRadioPressActivateContainer.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
 
        fZ = fZ + 0.01f;
-       ImageActor aRadioPressActivate = ImageActor::New(radioBgImage);
+       Dali::Toolkit::ImageView aRadioPressActivate = Dali::Toolkit::ImageView::New(radioBgImage);
        aRadioPressActivate.SetAnchorPoint(AnchorPoint::CENTER);
        aRadioPressActivate.SetParentOrigin(ParentOrigin::CENTER);
        aRadioPressActivate.SetZ(fZ);
@@ -652,7 +652,7 @@ unsigned int CHomeScreenCenterPopup::AddListItem(std::string strLabel, bool bSel
        aRadioPressActivate.SetColor(CENTER_POPUP_RADIO_BUTTON_BG_ON_THEME_COLOR);
 
        fZ = fZ + 0.01f;
-       ImageActor aRadioPressActivateShadow = ImageActor::New(radioActiveImage);
+       Dali::Toolkit::ImageView aRadioPressActivateShadow = Dali::Toolkit::ImageView::New(radioActiveImage);
        aRadioPressActivateShadow.SetAnchorPoint(AnchorPoint::CENTER);
        aRadioPressActivateShadow.SetParentOrigin(ParentOrigin::CENTER);
        aRadioPressActivateShadow.SetColor( CENTER_POPUP_RADIO_BUTTON_NORMAL_THEME_COLOR );
@@ -746,7 +746,7 @@ void CHomeScreenCenterPopup::SetTitle(std::string strTitle)
                }
 
                //// under line
-               //ImageActor aUndeLine = Dali::Toolkit::CreateSolidColorActor(cHomeScreenTheme->GetColor(CENTER_POPUP_LINE_COLOR_THEME));
+               //ImageView aUndeLine = Dali::Toolkit::CreateSolidColorActor(cHomeScreenTheme->GetColor(CENTER_POPUP_LINE_COLOR_THEME));
                //aUndeLine.SetAnchorPoint(Dali::AnchorPoint::BOTTOM_CENTER);
                //aUndeLine.SetParentOrigin(Dali::ParentOrigin::BOTTOM_CENTER);
 
@@ -1337,7 +1337,7 @@ void CHomeScreenCenterPopup::_Initialize()
 
        // dim bg       
        Image m_dimImage = ResourceImage::New(HOME_POPUP_BG_THEME_IMAGE);
-       m_aBgDim = ImageActor::New(m_dimImage);
+       m_aBgDim = Dali::Toolkit::ImageView::New(m_dimImage);
        m_aBgDim.SetParentOrigin(ParentOrigin::CENTER);
        m_aBgDim.SetAnchorPoint(AnchorPoint::CENTER);
        m_aBgDim.SetOpacity(0.0f);
@@ -1374,7 +1374,7 @@ void CHomeScreenCenterPopup::_Initialize()
        m_aPopupBg.SetAnchorPoint(Dali::AnchorPoint::BOTTOM_CENTER);
        m_aPopupBg.SetParentOrigin(Dali::ParentOrigin::BOTTOM_CENTER);
 
-       m_aPopupBg.SetStyle(Dali::ImageActor::STYLE_NINE_PATCH);
+//     m_aPopupBg.SetStyle(Dali::ImageView::STYLE_NINE_PATCH);
 
        fZ = fZ + 0.01f;
        m_aPopupBg.SetZ(0.11f);
@@ -1428,18 +1428,18 @@ Dali::Toolkit::PushButton CHomeScreenCenterPopup::_CreateButton(HomeScreenCenter
 
        ResourceImage image = ResourceImage::New( CENTER_POPUP_BUTTON_IMAGE );
 
-       Dali::ImageActor aNormalBg = ImageActor::New( image );
-       Dali::ImageActor aPressBg = ImageActor::New( image );
+       Dali::Toolkit::ImageView aNormalBg = Dali::Toolkit::ImageView::New( image );
+       Dali::Toolkit::ImageView aPressBg = Dali::Toolkit::ImageView::New( image );
 
        aNormalBg.SetColor(CENTER_POPUP_BUTTON_BG_NORMAL_COLOR_THEME_COLOR);
        aPressBg.SetColor(CENTER_POPUP_BUTTON_BG_PRESSED_COLOR_THEME_COLOR);
 
-       aNormalBg.SetStyle(Dali::ImageActor::STYLE_NINE_PATCH);
-       aPressBg.SetStyle(Dali::ImageActor::STYLE_NINE_PATCH);
+//     aNormalBg.SetStyle(Dali::ImageView::STYLE_NINE_PATCH);
+//     aPressBg.SetStyle(Dali::ImageView::STYLE_NINE_PATCH);
 
-       Vector4 ninePatchBorder = Vector4(38.0f, 1.0f, 38.0f, 1.0f);
-       aNormalBg.SetNinePatchBorder(ninePatchBorder);
-       aPressBg.SetNinePatchBorder(ninePatchBorder);
+//     Vector4 ninePatchBorder = Vector4(38.0f, 1.0f, 38.0f, 1.0f);
+//     aNormalBg.SetNinePatchBorder(ninePatchBorder);
+//     aPressBg.SetNinePatchBorder(ninePatchBorder);
 
        float fButtonW = 0;
        float fButtonH = CENTER_POPUP_BUTTON_HEIGHT;
index bb09fe8..c2ef111 100755 (executable)
@@ -136,8 +136,8 @@ private:
 
        Actor m_aPopupContainer;
 
-       ImageActor m_aPopupBg;
-       ImageActor m_aPopupBgShadow;
+       Dali::Toolkit::ImageView m_aPopupBg;
+       Dali::Toolkit::ImageView m_aPopupBgShadow;
 
        int m_nPopupContentHeight;
 
@@ -155,13 +155,13 @@ private:
        typedef std::map<unsigned int, ListItem *> ListItems;
        ListItems m_ListItems;
 
-       ImageActor m_aPopupTitleBg;
+       Dali::Toolkit::ImageView m_aPopupTitleBg;
        Dali::Toolkit::TextLabel m_aPopupTitleText;
        Dali::Toolkit::TextLabel mPopupTitleTextImg;
 
        std::string m_strTitleText;
 
-       Dali::ImageActor        m_aPopupActionArea;
+       Dali::Toolkit::ImageView        m_aPopupActionArea;
 
        Dali::Toolkit::PushButton m_aPopupButtonLeft;
        Dali::Toolkit::PushButton m_aPopupButtonRight;
@@ -175,7 +175,7 @@ private:
        Dali::Toolkit::TextLabel        m_PopupButtonTextRightImg;
        Dali::Toolkit::TextLabel        m_PopupButtonTextCenterImg;
 
-       ImageActor m_aPopupButtonDivider;
+       Dali::Toolkit::ImageView m_aPopupButtonDivider;
 
        // animation
        Animation m_ShowAnimation;
index e9458f0..1210c15 100755 (executable)
@@ -271,7 +271,7 @@ void CHomeScreenPageIndicator::_UpdateCount()
 {
        float fStartXPos = -((PAGE_SLIDER_WIDTH + PAGE_SLIDER_GAP) * (m_nPageCount - 1)) / 2.0f;
 
-       std::vector<ImageActor>::iterator iter;
+       std::vector<Dali::Toolkit::ImageView>::iterator iter;
 
        // remove existed indicator units
        for (iter = m_aUnitList.begin(); iter != m_aUnitList.end(); ++iter)
@@ -287,7 +287,7 @@ void CHomeScreenPageIndicator::_UpdateCount()
 
        for (unsigned int i = 0; i < m_nPageCount; i++)
        {
-               ImageActor aUnitImage = ImageActor::New(m_indicatorImage);
+               Dali::Toolkit::ImageView aUnitImage = Dali::Toolkit::ImageView::New(m_indicatorImage);
                aUnitImage.SetParentOrigin(ParentOrigin::CENTER);
                aUnitImage.SetAnchorPoint(AnchorPoint::CENTER);
                aUnitImage.SetPosition(Vector3(fStartXPos + i * (PAGE_SLIDER_WIDTH + PAGE_SLIDER_GAP), 0.0f, 0.0f));
@@ -462,21 +462,21 @@ Dali::Toolkit::PushButton CHomeScreenPageIndicator::_CreateButton( HomeScreenBut
                break;
        }
 
-       ImageActor normalImage;
-       ImageActor normalIconImage;
-       ImageActor pressImage;
-       ImageActor pressIconImage;
+       Dali::Toolkit::ImageView normalImage;
+       Dali::Toolkit::ImageView normalIconImage;
+       Dali::Toolkit::ImageView pressImage;
+       Dali::Toolkit::ImageView pressIconImage;
 
        //normal image
        Actor actor = Actor::New();
-       normalImage = ImageActor::New(bg_image);
+       normalImage = Dali::Toolkit::ImageView::New(bg_image);
        normalImage.SetSize(PAGE_MAIN_BUTTON_WIDTH, PAGE_MAIN_BUTTON_HEIGHT);
        normalImage.SetParentOrigin(ParentOrigin::CENTER);
        normalImage.SetAnchorPoint(AnchorPoint::CENTER);
        normalImage.SetColor(Vector4(0.0f, 0.0f, 0.0f, PAGE_MAIN_BUTTON_OPACITY));
        actor.Add(normalImage);
 
-       normalIconImage = ImageActor::New(icon_image);
+       normalIconImage = Dali::Toolkit::ImageView::New(icon_image);
        normalIconImage.SetSize(PAGE_MAIN_BUTTON_ICON_WIDTH, PAGE_MAIN_BUTTON_ICON_HEIGHT);
        normalIconImage.SetParentOrigin(ParentOrigin::CENTER);
        normalIconImage.SetAnchorPoint(AnchorPoint::CENTER);
@@ -486,14 +486,14 @@ Dali::Toolkit::PushButton CHomeScreenPageIndicator::_CreateButton( HomeScreenBut
 
        //press image
        actor = Actor::New();
-       pressImage = ImageActor::New(bg_image);
+       pressImage = Dali::Toolkit::ImageView::New(bg_image);
        pressImage.SetSize(PAGE_MAIN_BUTTON_WIDTH, PAGE_MAIN_BUTTON_HEIGHT);
        pressImage.SetParentOrigin(ParentOrigin::CENTER);
        pressImage.SetAnchorPoint(AnchorPoint::CENTER);
        pressImage.SetColor(Vector4(0.0f, 0.0f, 0.0f, PAGE_MAIN_BUTTON_PRESS_OPACITY));
        actor.Add(pressImage);
 
-       pressIconImage = ImageActor::New(icon_image);
+       pressIconImage = Dali::Toolkit::ImageView::New(icon_image);
        pressIconImage.SetSize(PAGE_MAIN_BUTTON_ICON_WIDTH, PAGE_MAIN_BUTTON_ICON_HEIGHT);
        pressIconImage.SetParentOrigin(ParentOrigin::CENTER);
        pressIconImage.SetAnchorPoint(AnchorPoint::CENTER);
@@ -641,7 +641,7 @@ void CHomeScreenPageIndicator::UpdateScreenReader(void)
        focusManager.SetAccessibilityAttribute(m_aLeftButton, Toolkit::AccessibilityManager::ACCESSIBILITY_LABEL, _("IDS_SCR_OPT_MENU_POP_UP_TTS"));
 
        /* unable to touch
-       std::vector<ImageActor>::iterator iter;
+       std::vector<Dali::Toolkit::ImageView>::iterator iter;
        int page=1;
        for (iter = m_aUnitList.begin(); iter != m_aUnitList.end(); ++iter)
        {
index dde9acd..1590b01 100755 (executable)
@@ -110,7 +110,7 @@ private:
        unsigned int m_nWidth;
        unsigned int m_nHeight;
 
-       std::vector<Dali::ImageActor> m_aUnitList;
+       std::vector<Dali::Toolkit::ImageView> m_aUnitList;
 
        Dali::Toolkit::ScrollView m_aScrollView;
        unsigned int m_nScrollWidth;
index 825c307..84ffaf1 100755 (executable)
@@ -549,7 +549,7 @@ Image CHomeScreenViewManager::_CreateFillCroppedImage(const std::string path, co
                ImageDimensions dimensions(size.x, size.y);
                Image image = LoadImageSynchronously(path, dimensions, FittingMode::SCALE_TO_FILL );
 
-               ImageActor imageActor = ImageActor::New(image);
+               Dali::Toolkit::ImageView imageActor = Dali::Toolkit::ImageView::New(image);
                imageActor.SetParentOrigin(ParentOrigin::CENTER);
                imageActor.SetSize(size);
                imageActor.SetScale(1.0f, -1.0f, 1.0f);
@@ -735,7 +735,7 @@ void CHomeScreenViewManager::_WallpaperImageUploadedFinishedHandler(Image image)
                        m_BgImageActor.Reset();
                }
 
-               m_BgImageActor = ImageActor::New(m_BgImage);
+               m_BgImageActor = Dali::Toolkit::ImageView::New(m_BgImage);
                m_BgImageActor.SetParentOrigin(ParentOrigin::CENTER);
                m_BgImageActor.SetAnchorPoint(AnchorPoint::CENTER);
                m_BgImageActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
index 660a4e6..c773812 100755 (executable)
@@ -155,7 +155,7 @@ private:
        Dali::FrameBufferImage          m_BlurImage;
 
        Dali::Image             m_BgImage;
-       Dali::ImageActor        m_BgImageActor;
+       Dali::Toolkit::ImageView        m_BgImageActor;
 
        bool                                            m_bBgLoaded;
 
index 5299024..2a5a2ad 100755 (executable)
@@ -116,7 +116,7 @@ void MenuPopup::OnInitialize()
 
        // bg image
        Image m_Image = ResourceImage::New(HOME_POPUP_INSIDE_BG_THEME_IMAGE);
-       mBgImage = ImageActor::New(m_Image);
+       mBgImage = Dali::Toolkit::ImageView::New(m_Image);
        mBgImage.SetAnchorPoint(AnchorPoint::CENTER);
        mBgImage.SetParentOrigin(ParentOrigin::CENTER);
 
@@ -126,7 +126,7 @@ void MenuPopup::OnInitialize()
        mContainer.Add(mBgImage);
 
        Image m_dimImage = ResourceImage::New(HOME_POPUP_BG_THEME_IMAGE);
-       mPopupOutArea = ImageActor::New(m_dimImage);
+       mPopupOutArea = Dali::Toolkit::ImageView::New(m_dimImage);
        mPopupOutArea.SetOpacity(0.0f);
 
        mPopupOutArea.SetParentOrigin( ParentOrigin::CENTER );
@@ -208,7 +208,7 @@ unsigned int MenuPopup::AddButton(std::string icon, std::string text, bool bDimm
        normal.SetParentOrigin(ParentOrigin::CENTER_LEFT);
 
        // button bg image
-       ImageActor buttonBg;
+       Dali::Toolkit::ImageView buttonBg;
        buttonBg = CreateSolidColorActor(MORE_POPUP_BUTTON_BG_NORMAL_COLOR_THEME_COLOR);
 
        // Set gradation style for menu popup
@@ -246,7 +246,7 @@ unsigned int MenuPopup::AddButton(std::string icon, std::string text, bool bDimm
        press.SetParentOrigin(ParentOrigin::CENTER_LEFT);
 
        // press bg image
-       ImageActor pressBg;
+       Dali::Toolkit::ImageView pressBg;
        pressBg = CreateSolidColorActor(MORE_POPUP_BUTTON_BG_PRESSED_COLOR_THEME_COLOR);
 
        pressBg.SetAnchorPoint(AnchorPoint::CENTER);
@@ -524,7 +524,7 @@ void MenuPopup::ResizeAll(void)
        ImageList::iterator iter;
        for (iter = mLineList.begin(); iter != mLineList.end(); iter++)
        {
-               ImageActor actor = (*iter);
+               Dali::Toolkit::ImageView actor = (*iter);
                if (actor)
                {
                        actor.SetSize(mButtonMaxWidth - 2.0f, 1.0f);
@@ -534,7 +534,7 @@ void MenuPopup::ResizeAll(void)
        // press bg
        for (iter = mPressBgList.begin(); iter != mPressBgList.end(); iter++)
        {
-               ImageActor actor = (*iter);
+               Dali::Toolkit::ImageView actor = (*iter);
                if (actor)
                {
                        actor.SetSize(mButtonMaxWidth - (MORE_POPUP_BUTTON_PRESS_PADDING * 2), (MORE_POPUP_BUTTON_H - MORE_POPUP_BUTTON_PRESS_TOP_PADDING));
index 4ed7f62..289349f 100755 (executable)
@@ -146,7 +146,7 @@ private:
        Layer mLayer;
        Actor mContainer;
 
-       ImageActor mBgImage;
+       Dali::Toolkit::ImageView mBgImage;
        Actor mPopupOutArea;
 
        unsigned int mButtonCount;
@@ -157,7 +157,7 @@ private:
        std::map<int, std::string> mTextMap;
        std::map<int, bool> mDimmedMap;
 
-       typedef std::list<ImageActor> ImageList;
+       typedef std::list<Dali::Toolkit::ImageView> ImageList;
        ImageList mLineList;
        ImageList mPressBgList;
 
index 8a388cb..149f197 100755 (executable)
@@ -2085,8 +2085,8 @@ void CMainMenuAppsView::SetWallpaper(Dali::Image image, Dali::Image blurredImage
 
        mBgBlurImage = blurredImage;
 
-       mBgBlurImageActor = ImageActor::New(mBgBlurImage);
-       mBgBlurImageActor.SetShaderEffect(mEffect);
+       mBgBlurImageActor = Dali::Toolkit::ImageView::New(mBgBlurImage);
+//     mBgBlurImageActor.SetShaderEffect(mEffect);
        mBgBlurImageActor.SetParentOrigin(ParentOrigin::TOP_LEFT);
        mBgBlurImageActor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
        mBgBlurImageActor.SetSize(ALL_APPS_VIEW_WIDTH, ALL_APPS_VIEW_HEIGHT);
index fb81fd2..57f5377 100755 (executable)
@@ -276,7 +276,7 @@ private:
        // wall paper
        ShaderEffect            mEffect;
        Constraint                                              mEffectTopLeftConstraint;
-       ImageActor                                              mBgBlurImageActor;
+       Toolkit::ImageView                                              mBgBlurImageActor;
        Image                                                   mBgImage;
        Image                                                   mBgBlurImage;
        ClusterHome3D::CMainMenuPage    m_FocusedPage;
index 59e97fa..16bbb15 100755 (executable)
@@ -113,10 +113,10 @@ Toolkit::Internal::Control(ControlBehaviour(ACTOR_BEHAVIOUR_NONE))
        if (!mBoxImgPath.empty())
        {
                Image image = ResourceImage::New(mBoxImgPath);
-               mMenuBoxBaseImage = ImageActor::New(image);
+               mMenuBoxBaseImage = Dali::Toolkit::ImageView::New(image);
 
                Dali::ShaderEffect shaderEffect =  Dali::ShaderEffect::New(VERTEX_SHADER, "");
-               mMenuBoxBaseImage.SetShaderEffect(shaderEffect);
+//             mMenuBoxBaseImage.SetShaderEffect(shaderEffect);
        }
 }
 
@@ -154,13 +154,13 @@ Toolkit::Internal::Control(ControlBehaviour(ACTOR_BEHAVIOUR_NONE))
                mMenuBoxBaseImageData.LoadingFinishedSignal().Connect( this, &CMainMenuBox::_OnImageLoadFinishedHandler );
 
 
-               mMenuBoxBaseImage = ImageActor::New(mMenuBoxBaseImageData);
+               mMenuBoxBaseImage = Dali::Toolkit::ImageView::New(mMenuBoxBaseImageData);
                mMenuBoxShadowImage = CreateSolidColorActor(Vector4(0.5, 0.5, 0.5, 0.0f));
 
                if (mMenuBoxBaseImage)
                {
                        Dali::ShaderEffect shaderEffect =  Dali::ShaderEffect::New(VERTEX_SHADER, "");
-                       mMenuBoxBaseImage.SetShaderEffect(shaderEffect);
+//                     mMenuBoxBaseImage.SetShaderEffect(shaderEffect);
                }
 
        }
index d1f211e..d3d6c03 100755 (executable)
@@ -102,8 +102,8 @@ protected:
        std::string mBoxImgPath;        ///< box image path
 
        // box
-       ImageActor mMenuBoxBaseImage;
-       ImageActor mMenuBoxShadowImage;
+       Dali::Toolkit::ImageView mMenuBoxBaseImage;
+       Dali::Toolkit::ImageView mMenuBoxShadowImage;
        ResourceImage mMenuBoxBaseImageData;
        Actor mMenuBoxContainer;                ///< container actor that has base image and shadow image or text..
 
index 4a06c9e..2a9000e 100755 (executable)
@@ -529,7 +529,7 @@ void CMainMenuCustomBox::_SetCheckBoxImage()
                Image image;
 
                image = ResourceImage::New(ICONDIR"/core_check_bg.png");
-               ImageActor actor1 = ImageActor::New(image);
+               Dali::Toolkit::ImageView actor1 = Dali::Toolkit::ImageView::New(image);
                actor1.SetParentOrigin( ParentOrigin::CENTER );
                actor1.SetAnchorPoint( AnchorPoint::CENTER );
                actor1.SetPosition( Vector3::ZERO );
@@ -538,7 +538,7 @@ void CMainMenuCustomBox::_SetCheckBoxImage()
                m_MenuBoxCheckedImage.Add( actor1 );
 
                image = ResourceImage::New(ICONDIR"/core_check_bg_stroke.png");
-               ImageActor actor2 = ImageActor::New(image);
+               Dali::Toolkit::ImageView actor2 = Dali::Toolkit::ImageView::New(image);
                actor2.SetParentOrigin( ParentOrigin::CENTER );
                actor2.SetAnchorPoint( AnchorPoint::CENTER );
                actor2.SetPosition( Vector3(0.0f, 0.0f, 0.01f) );
@@ -547,7 +547,7 @@ void CMainMenuCustomBox::_SetCheckBoxImage()
                m_MenuBoxCheckedImage.Add( actor2 );
 
                image = ResourceImage::New(ICONDIR"/core_check_icon.png");
-               ImageActor actor3 = ImageActor::New(image);
+               Dali::Toolkit::ImageView actor3 = Dali::Toolkit::ImageView::New(image);
                actor3.SetParentOrigin( ParentOrigin::CENTER );
                actor3.SetAnchorPoint( AnchorPoint::CENTER );
                actor3.SetPosition( Vector3(0.0f, 0.0f, 0.02f) );
@@ -566,7 +566,7 @@ void CMainMenuCustomBox::_SetCheckBoxImage()
                Image image;
 
                image = ResourceImage::New(ICONDIR"/core_check_bg.png");
-               ImageActor actor1 = ImageActor::New(image);
+               Dali::Toolkit::ImageView actor1 = Dali::Toolkit::ImageView::New(image);
                actor1.SetParentOrigin( ParentOrigin::CENTER );
                actor1.SetAnchorPoint( AnchorPoint::CENTER );
                actor1.SetPosition( Vector3::ZERO );
@@ -575,7 +575,7 @@ void CMainMenuCustomBox::_SetCheckBoxImage()
                m_MenuBoxUnCheckedImage.Add( actor1 );
 
                image = ResourceImage::New(ICONDIR"/core_check_bg_stroke.png");
-               ImageActor actor2 = ImageActor::New(image);
+               Dali::Toolkit::ImageView actor2 = Dali::Toolkit::ImageView::New(image);
                actor2.SetParentOrigin( ParentOrigin::CENTER );
                actor2.SetAnchorPoint( AnchorPoint::CENTER );
                actor2.SetPosition( Vector3(0.0f, 0.0f, 0.01f) );
index 0d60644..4d7612e 100755 (executable)
@@ -111,7 +111,7 @@ void CMainMenuFolderBox::OnMenuBoxInitialized()
 
        mMenuFolderImageData.LoadingFinishedSignal().Connect( this, &CMainMenuFolderBox::_OnImageLoadFinishedHandler );
 
-       mMenuFolderBg = ImageActor::New( mMenuFolderImageData );
+       mMenuFolderBg = Dali::Toolkit::ImageView::New( mMenuFolderImageData );
        mMenuFolderBg.SetParentOrigin(ParentOrigin::CENTER);
        mMenuFolderBg.SetAnchorPoint(AnchorPoint::CENTER);
        mMenuFolderBg.SetSize(BOX_ICON_WIDTH, BOX_ICON_HEIGHT);
@@ -121,7 +121,7 @@ void CMainMenuFolderBox::OnMenuBoxInitialized()
 
        // folder selected bg
        Image SelectedImageData = ResourceImage::New(ICONDIR"/folder_appicon_bg_selected.png");
-       mMenuFolderSelectedBg = ImageActor::New( SelectedImageData );
+       mMenuFolderSelectedBg = Dali::Toolkit::ImageView::New( SelectedImageData );
        mMenuFolderSelectedBg.SetParentOrigin(ParentOrigin::CENTER);
        mMenuFolderSelectedBg.SetAnchorPoint(AnchorPoint::CENTER);
        mMenuFolderSelectedBg.SetOpacity(0.0f);
@@ -1229,7 +1229,7 @@ void CMainMenuFolderBox::_CreateMenuFolder(void)
                // touch area to close folder with dimmed color
 
                Image m_dimImage = ResourceImage::New(HOME_POPUP_BG_THEME_IMAGE);
-               mOutFolderArea = ImageActor::New(m_dimImage);
+               mOutFolderArea = Dali::Toolkit::ImageView::New(m_dimImage);
                mOutFolderArea.SetOpacity(0.0f);
 
                mOutFolderArea.SetParentOrigin( ParentOrigin::CENTER );
@@ -1272,7 +1272,7 @@ void CMainMenuFolderBox::_CreateMenuFolder(void)
        if (!mFolderWindowBg01)
        {
                Image image = ResourceImage::New(ICONDIR"/folder_popup_bg_01.#.png");
-               mFolderWindowBg01 = ImageActor::New(image);
+               mFolderWindowBg01 = Dali::Toolkit::ImageView::New(image);
                mFolderWindowBg01.SetParentOrigin(ParentOrigin::CENTER);
                mFolderWindowBg01.SetAnchorPoint(AnchorPoint::CENTER);
                mFolderWindowBg01.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
@@ -1284,7 +1284,7 @@ void CMainMenuFolderBox::_CreateMenuFolder(void)
        if (!mFolderWindowBg02)
        {
                Image image = ResourceImage::New(ICONDIR"/folder_popup_bg_02.#.png");
-               mFolderWindowBg02 = ImageActor::New(image);
+               mFolderWindowBg02 = Dali::Toolkit::ImageView::New(image);
                mFolderWindowBg02.SetParentOrigin(ParentOrigin::CENTER);
                mFolderWindowBg02.SetAnchorPoint(AnchorPoint::CENTER);
                mFolderWindowBg02.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
@@ -1372,11 +1372,11 @@ void CMainMenuFolderBox::_CreateMenuFolder(void)
                mTextDeleteButton = Dali::Toolkit::PushButton::New();
 
                Image image = ResourceImage::New(ICONDIR"/00_edit_field_clear.png");
-               ImageActor buttonImage = ImageActor::New(image);
+               Dali::Toolkit::ImageView buttonImage = Dali::Toolkit::ImageView::New(image);
                buttonImage.SetColor( FOLDER_CODE_DELETE_BTN_IMAGE_COLOR );
                mTextDeleteButton.SetButtonImage(buttonImage);
 
-               ImageActor pressedImage = ImageActor::New(image);
+               Dali::Toolkit::ImageView pressedImage = Dali::Toolkit::ImageView::New(image);
                pressedImage.SetColor( FOLDER_CODE_DELETE_BTN_P_IMAGE_COLOR);
                mTextDeleteButton.SetSelectedImage(pressedImage);
 
@@ -2115,11 +2115,11 @@ void CMainMenuFolderBox::_OnFolderTitleEditStarted( Dali::Toolkit::Control textF
                mFolderName.SetParentOrigin( ParentOrigin::CENTER );
        }
        Actor aNormal = mTextDeleteButton.GetButtonImage();
-       ImageActor aNormalImage = ImageActor::DownCast(aNormal);
+       Dali::Toolkit::ImageView aNormalImage = Dali::Toolkit::ImageView::DownCast(aNormal);
        aNormalImage.SetColor( FOLDER_CODE_DELETE_BTN_IMAGE_COLOR) ;
 
        Actor aPressed = mTextDeleteButton.GetSelectedImage();
-       ImageActor aPressedImage = ImageActor::DownCast(aPressed);
+       Dali::Toolkit::ImageView aPressedImage = Dali::Toolkit::ImageView::DownCast(aPressed);
        aPressedImage.SetColor( FOLDER_CODE_DELETE_BTN_P_IMAGE_COLOR);
 
        _SetFolderTitleStyle(FOLDER_CODE_TITLE_SIZE, FOLDER_CODE_TITLE_COLOR);
@@ -2376,7 +2376,7 @@ void CMainMenuFolderBox::OnBoxIsOnFolder(bool bIsOn)
                if(!mClosedMenuFolderFocusBgImage)
                {
                        Image bgImage = ResourceImage::New( ICONDIR "/folder_appicon_bg_possible.png" );
-                       mClosedMenuFolderFocusBgImage  = ImageActor::New( bgImage );
+                       mClosedMenuFolderFocusBgImage  = Dali::Toolkit::ImageView::New( bgImage );
                        mClosedMenuFolderFocusBgImage.SetParentOrigin( ParentOrigin::CENTER );
                        mClosedMenuFolderFocusBgImage.SetAnchorPoint( AnchorPoint::CENTER );
                        mClosedMenuFolderFocusBgImage.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
@@ -2709,7 +2709,7 @@ void CMainMenuFolderBox::_SetCheckBoxImage()
                Image image;
 
                image = ResourceImage::New(ICONDIR"/core_check_bg.png");
-               ImageActor actor1 = ImageActor::New(image);
+               Dali::Toolkit::ImageView actor1 = Dali::Toolkit::ImageView::New(image);
                actor1.SetParentOrigin( ParentOrigin::CENTER );
                actor1.SetAnchorPoint( AnchorPoint::CENTER );
                actor1.SetPosition( Vector3::ZERO );
@@ -2718,7 +2718,7 @@ void CMainMenuFolderBox::_SetCheckBoxImage()
                m_MenuBoxCheckedImage.Add( actor1 );
 
                image = ResourceImage::New(ICONDIR"/core_check_bg_stroke.png");
-               ImageActor actor2 = ImageActor::New(image);
+               Dali::Toolkit::ImageView actor2 = Dali::Toolkit::ImageView::New(image);
                actor2.SetParentOrigin( ParentOrigin::CENTER );
                actor2.SetAnchorPoint( AnchorPoint::CENTER );
                actor2.SetPosition( Vector3(0.0f, 0.0f, 0.01f) );
@@ -2727,7 +2727,7 @@ void CMainMenuFolderBox::_SetCheckBoxImage()
                m_MenuBoxCheckedImage.Add( actor2 );
 
                image = ResourceImage::New(ICONDIR"/core_check_icon.png");
-               ImageActor actor3 = ImageActor::New(image);
+               Dali::Toolkit::ImageView actor3 = Dali::Toolkit::ImageView::New(image);
                actor3.SetParentOrigin( ParentOrigin::CENTER );
                actor3.SetAnchorPoint( AnchorPoint::CENTER );
                actor3.SetPosition( Vector3(0.0f, 0.0f, 0.02f) );
@@ -2746,7 +2746,7 @@ void CMainMenuFolderBox::_SetCheckBoxImage()
                Image image;
 
                image = ResourceImage::New(ICONDIR"/core_check_bg.png");
-               ImageActor actor1 = ImageActor::New(image);
+               Dali::Toolkit::ImageView actor1 = Dali::Toolkit::ImageView::New(image);
                actor1.SetParentOrigin( ParentOrigin::CENTER );
                actor1.SetAnchorPoint( AnchorPoint::CENTER );
                actor1.SetPosition( Vector3::ZERO );
@@ -2755,7 +2755,7 @@ void CMainMenuFolderBox::_SetCheckBoxImage()
                m_MenuBoxUnCheckedImage.Add( actor1 );
 
                image = ResourceImage::New(ICONDIR"/core_check_bg_stroke.png");
-               ImageActor actor2 = ImageActor::New(image);
+               Dali::Toolkit::ImageView actor2 = Dali::Toolkit::ImageView::New(image);
                actor2.SetParentOrigin( ParentOrigin::CENTER );
                actor2.SetAnchorPoint( AnchorPoint::CENTER );
                actor2.SetPosition( Vector3(0.0f, 0.0f, 0.01f) );
index 7c0c1b3..4129760 100755 (executable)
@@ -247,11 +247,11 @@ protected:
        /*
         * Folder box resources
         */
-       ImageActor mMenuFolderBg;
-       ImageActor mMenuFolderSelectedBg;
-       ImageActor mMenuFolderShadowBg;
-       ImageActor mClosedMenuFolderBgImage;            ///< closed folder box(nine patch)
-       ImageActor mClosedMenuFolderFocusBgImage;
+       Dali::Toolkit::ImageView mMenuFolderBg;
+       Dali::Toolkit::ImageView mMenuFolderSelectedBg;
+       Dali::Toolkit::ImageView mMenuFolderShadowBg;
+       Dali::Toolkit::ImageView mClosedMenuFolderBgImage;              ///< closed folder box(nine patch)
+       Dali::Toolkit::ImageView mClosedMenuFolderFocusBgImage;
 
        ResourceImage   mMenuFolderImageData;
 
@@ -261,8 +261,8 @@ protected:
        Dali::Layer mFolderWindowLayer;
        Actor mFolderWindowContainer;
        Actor mFolderWindowBg;
-       ImageActor mFolderWindowBg01;
-       ImageActor mFolderWindowBg02;
+       Dali::Toolkit::ImageView mFolderWindowBg01;
+       Dali::Toolkit::ImageView mFolderWindowBg02;
 
        Actor mFolderTitle;
        Actor mFolderTitleUnderLine;
@@ -280,13 +280,13 @@ protected:
        // edit button
        Dali::Toolkit::PushButton mFdUnfoldButton;
        Actor mFdUnfoldButtonActor;
-       ImageActor mFdUnfoldButtonImage;
-       ImageActor mFdUnfoldButtonPressImage;
+       Dali::Toolkit::ImageView mFdUnfoldButtonImage;
+       Dali::Toolkit::ImageView mFdUnfoldButtonPressImage;
 
        Dali::Toolkit::PushButton mFdAddAppsButton;
        Actor mFdAddAppsButtonActor;
-       ImageActor mFdAddAppsButtonImage;
-       ImageActor mFdAddAppsButtonPressImage;
+       Dali::Toolkit::ImageView mFdAddAppsButtonImage;
+       Dali::Toolkit::ImageView mFdAddAppsButtonPressImage;
 
        Actor mFdDvider;
 
index decf64d..9f07ad7 100755 (executable)
@@ -1224,7 +1224,7 @@ void CMainMenuFolderView::UpdateClosedFolderImage(void)
 
                                std::string filePath = box.GetBaseImage().GetUrl();
                                Image imageData = ResourceImage::New(filePath);;
-                               closedFdBoxItem->boxItem = ImageActor::New(imageData);
+                               closedFdBoxItem->boxItem = Dali::Toolkit::ImageView::New(imageData);
                                closedFdBoxItem->boxItem.SetParentOrigin(ParentOrigin::CENTER);
                                closedFdBoxItem->boxItem.SetAnchorPoint(AnchorPoint::CENTER);
                                closedFdBoxItem->boxItem.SetSize(CLOSED_FOLDER_ITEM_W, CLOSED_FOLDER_ITEM_H);
index 8ab414f..1ebb13a 100755 (executable)
@@ -39,8 +39,8 @@ namespace Internal
 
 typedef struct ClosedFolderBoxItem
 {
-       ImageActor boxItem ;
-       ImageActor boxShadowItem ;
+       Dali::Toolkit::ImageView boxItem ;
+       Dali::Toolkit::ImageView boxShadowItem ;
        unsigned int boxId;
        unsigned int boxLayoutPosition;
 
@@ -52,13 +52,13 @@ public:
                if (boxShadowItem)
                {
                        boxShadowItem.RemoveConstraints();
-                       boxShadowItem.RemoveShaderEffect();
+//     boxShadowItem.RemoveShaderEffect();
                        boxShadowItem.Reset();
                }
                if (boxItem)
                {
                        boxItem.RemoveConstraints();
-                       boxItem.RemoveShaderEffect();
+//     boxItem.RemoveShaderEffect();
                        boxItem.Reset();
                }
        };
index 7b1d0a7..b7a97db 100755 (executable)
@@ -224,7 +224,7 @@ protected:
        // for thumbnail page
        Actor m_ThumbnailPage;
 
-       ImageActor mShadowImage;
+       Dali::Toolkit::ImageView mShadowImage;
 
        Image mShadowBgImage;
 
@@ -247,7 +247,7 @@ protected:
 
 private:
        IMainMenuDataObserver*                  m_pObserver;
-       ImageActor                              mGrayBg;
+       Dali::Toolkit::ImageView                                mGrayBg;
 public:
        /*
         * Singals
index ce669a7..696a93d 100755 (executable)
 using namespace ClusterHome3D ;
 namespace ClusterHome3D
 {
-       ImageActor CreateSolidColorActor( const Vector4& color, bool border, const Vector4& borderColor, const unsigned int borderSize )
+       Dali::Toolkit::ImageView CreateSolidColorActor( const Vector4& color, bool border, const Vector4& borderColor, const unsigned int borderSize )
        {
-               return Dali::Toolkit::CreateSolidColorActor( color, border, borderColor, borderSize );
+               
+               Toolkit::ImageView imageView = Toolkit::ImageView::New();
+               Property::Map solidColorProperty;
+               solidColorProperty.Insert( "renderer-type", "color-renderer" );
+               solidColorProperty.Insert( "blend-color",color);
+               imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, solidColorProperty );
+               return imageView;
        }
-       ImageActor CreateTestSolidColorActor()
+       Dali::Toolkit::ImageView CreateTestSolidColorActor()
        {
-               ImageActor test = Dali::Toolkit::CreateSolidColorActor( Vector4((float)(rand()%10)/10, (float)(rand()%10)/10, (float)(rand()%10)/10, 0.5f), false,  Color::WHITE, 1 );  
-               test.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
-               test.SetAnchorPoint(AnchorPoint::CENTER);
-               test.SetParentOrigin(ParentOrigin::CENTER);
-               test.SetPosition(0.0f, 0.0f, 0.5f);
-               return test;
+               Toolkit::ImageView imageView = Toolkit::ImageView::New();
+               imageView.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+               imageView.SetAnchorPoint(AnchorPoint::CENTER);
+               imageView.SetParentOrigin(ParentOrigin::CENTER);
+               imageView.SetPosition(0.0f, 0.0f, 0.5f);
+               Property::Map solidColorProperty;
+               solidColorProperty.Insert( "renderer-type", "color-renderer" );
+               solidColorProperty.Insert( "blend-color",Vector4((float)(rand()%10)/10, (float)(rand()%10)/10, (float)(rand()%10)/10, 0.5f));
+               imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, solidColorProperty );
+               return imageView;
        }
 }
 
index 566e826..3ef3abb 100755 (executable)
@@ -25,8 +25,8 @@
 using namespace ClusterHome3D ;
 namespace ClusterHome3D
 {
-       ImageActor CreateSolidColorActor( const Vector4& color, bool border = false, const Vector4& borderColor = Color::WHITE, const unsigned int borderSize = 1 );
-       ImageActor CreateTestSolidColorActor();
+       Dali::Toolkit::ImageView CreateSolidColorActor( const Vector4& color, bool border = false, const Vector4& borderColor = Color::WHITE, const unsigned int borderSize = 1 );
+       Dali::Toolkit::ImageView CreateTestSolidColorActor();
 }
 
 
index 3d47aa7..ea30de5 100755 (executable)
@@ -220,7 +220,7 @@ void CUtilTextImge::_CreateTextImage(void)
        {
                Actor self = Self();
 
-               m_ImgActorTextName = ImageActor::New(m_BitmapTextName);
+               m_ImgActorTextName = Dali::Toolkit::ImageView::New(m_BitmapTextName);
                m_ImgActorTextName.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
                //m_ImgActorTextName.SetSize(m_stTextDisplayInfo.width, m_stTextDisplayInfo.height);
 
@@ -228,8 +228,8 @@ void CUtilTextImge::_CreateTextImage(void)
                m_ImgActorTextName.SetAnchorPoint(AnchorPoint::TOP_LEFT);
 
                // unpremultiply
-               m_ImgActorTextName.SetBlendFunc(Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE_MINUS_SRC_ALPHA,
-                                       Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE );
+//             m_ImgActorTextName.SetBlendFunc(Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE_MINUS_SRC_ALPHA,
+       //                              Dali::BlendingFactor::ONE, Dali::BlendingFactor::ONE );
 
                // unpremultiply for alphablending
                ClusterHome3D::UnpremultiplyEffect::Apply( m_ImgActorTextName);
index 66650fe..4556f7f 100755 (executable)
@@ -93,7 +93,7 @@ private:
 
 private:
 
-       ImageActor                      m_ImgActorTextName;
+       Dali::Toolkit::ImageView                        m_ImgActorTextName;
        BufferImage                     m_BitmapTextName;
 
        std::string                     m_strName;