Merge "[3.0] Removed 3D layer dependency of Model3dView and Mesh Visual." into tizen

[platform/core/uifw/dali-demo.git] / examples / radial-menu / radial-menu-example.cpp

diff --git a/examples/radial-menu/radial-menu-example.cpp b/examples/radial-menu/radial-menu-example.cpp
index 9f5b9fa..13be24a 100644 (file)
--- a/examples/radial-menu/radial-menu-example.cpp
+++ b/examples/radial-menu/radial-menu-example.cpp
@@ -26,16 +26,16 @@ using namespace Dali::Toolkit;
 
 namespace
 {
-const char* TEST_OUTER_RING_FILENAME = DALI_IMAGE_DIR "layer2.png"; // Image to be masked
-const char* TEST_INNER_RING_FILENAME = DALI_IMAGE_DIR "layer1.png"; // Image to be masked
-const char* TEST_MENU_FILENAME = DALI_IMAGE_DIR "layer3.png"; // Image to be masked
-const char* TEST_DIAL_FILENAME = DALI_IMAGE_DIR "layer4.png"; // Image to be masked
-const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); // Background for toolbar
+const char* TEST_OUTER_RING_FILENAME = DEMO_IMAGE_DIR "layer2.png"; // Image to be masked
+const char* TEST_INNER_RING_FILENAME = DEMO_IMAGE_DIR "layer1.png"; // Image to be masked
+const char* TEST_MENU_FILENAME = DEMO_IMAGE_DIR "layer3.png"; // Image to be masked
+const char* TEST_DIAL_FILENAME = DEMO_IMAGE_DIR "layer4.png"; // Image to be masked
+const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); // Background for toolbar
 const char* APPLICATION_TITLE( "Radial Menu" );
-const char * const PLAY_ICON( DALI_IMAGE_DIR "icon-play.png" );
-const char * const PLAY_ICON_SELECTED( DALI_IMAGE_DIR "icon-play-selected.png" );
-const char * const STOP_ICON( DALI_IMAGE_DIR "icon-stop.png" );
-const char * const STOP_ICON_SELECTED( DALI_IMAGE_DIR "icon-stop-selected.png" );
+const char * const PLAY_ICON( DEMO_IMAGE_DIR "icon-play.png" );
+const char * const PLAY_ICON_SELECTED( DEMO_IMAGE_DIR "icon-play-selected.png" );
+const char * const STOP_ICON( DEMO_IMAGE_DIR "icon-stop.png" );
+const char * const STOP_ICON_SELECTED( DEMO_IMAGE_DIR "icon-stop-selected.png" );
 }
 
 
@@ -172,15 +172,14 @@ void RadialMenuExample::OnInit(Application& app)
   mRadialSweepView3.SetInitialActorAngle(Degree(-110));
   mRadialSweepView3.SetFinalActorAngle(Degree(0));
 
-  Image dial = ResourceImage::New( TEST_DIAL_FILENAME );
-  mDialView = ImageView::New( dial );
+  mDialView = ImageView::New( TEST_DIAL_FILENAME );
   mDialView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-  mDialView.SetPositionInheritanceMode(USE_PARENT_POSITION);
+  mDialView.SetParentOrigin( ParentOrigin::CENTER );
   mDialView.SetScale(scale);
   Layer dialLayer = Layer::New();
 
   dialLayer.Add( mDialView );
-  dialLayer.SetPositionInheritanceMode(USE_PARENT_POSITION);
+  dialLayer.SetParentOrigin( ParentOrigin::CENTER );
   dialLayer.SetSize(stage.GetSize());
   mContents.Add(dialLayer);
 
@@ -254,8 +253,7 @@ RadialSweepView RadialMenuExample::CreateSweepView( std::string imageName,
                                                     Degree finalAngle)
 {
   // Create the image
-  Image image = ResourceImage::New(imageName);
-  mImageView = ImageView::New(image);
+  mImageView = ImageView::New(imageName);
   mImageView.SetParentOrigin(ParentOrigin::CENTER);
   mImageView.SetAnchorPoint(AnchorPoint::CENTER);
   mImageView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
@@ -271,10 +269,10 @@ RadialSweepView RadialMenuExample::CreateSweepView( std::string imageName,
   radialSweepView.SetFinalSector( Degree(359.999f) );
   radialSweepView.SetSize( Stage::GetCurrent().GetSize());
   radialSweepView.SetEasingFunction( Dali::AlphaFunction::EASE_IN_OUT );
-  radialSweepView.SetPositionInheritanceMode(USE_PARENT_POSITION);
+  radialSweepView.SetParentOrigin( ParentOrigin::CENTER );
   mContents.Add(radialSweepView);
   radialSweepView.Add( mImageView );
-  mImageView.SetPositionInheritanceMode(USE_PARENT_POSITION);
+  mImageView.SetParentOrigin( ParentOrigin::CENTER );
 
   return radialSweepView;
 }
@@ -299,9 +297,9 @@ void RunTest(Application app)
 }
 
 // Entry point for Linux & Tizen applications
-int main(int argc, char **argv)
+int DALI_EXPORT_API main(int argc, char **argv)
 {
-  Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
+  Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
 
   RunTest(app);