[dali_1.1.33] Merge branch 'devel/master'

[platform/core/uifw/dali-demo.git] / examples / item-view / item-view-example.cpp

diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp
index 3ebc0b5..c898c0c 100644 (file)
--- a/examples/item-view/item-view-example.cpp
+++ b/examples/item-view/item-view-example.cpp
@@ -209,8 +209,6 @@ public:
                                              TOOLBAR_IMAGE,
                                              "" );
 
-    //app.GetWindow().GetOrientation().ChangedSignal().Connect( this, &ItemViewExample::OnOrientationChanged );
-
     // Create an edit mode button. (left of toolbar)
     Toolkit::PushButton editButton = Toolkit::PushButton::New();
     editButton.SetUnselectedImage( EDIT_IMAGE );
@@ -380,24 +378,6 @@ public:
     mItemView.ActivateLayout( layoutId, Vector3(stageSize.x, stageSize.y, stageSize.x), 0.0f );
   }
 
-  /**
-   * Orientation changed signal callback
-   * @param orientation
-   */
-  void OnOrientationChanged( Orientation orientation )
-  {
-    const unsigned int angle = orientation.GetDegrees();
-
-    // If orientation really changed
-    if( mOrientation != angle )
-    {
-      // Remember orientation
-      mOrientation = angle;
-
-      SetLayout( mCurrentLayout );
-    }
-  }
-
   bool OnLayoutButtonClicked( Toolkit::Button button )
   {
     // Switch to the next layout
@@ -863,7 +843,7 @@ public: // From ItemFactory
     borderActor.SetColorMode( USE_PARENT_COLOR );
 
     Property::Map borderProperty;
-    borderProperty.Insert( "rendererType", "borderRenderer" );
+    borderProperty.Insert( "rendererType", "border" );
     borderProperty.Insert( "borderColor", Color::WHITE );
     borderProperty.Insert( "borderSize", ITEM_BORDER_SIZE );
     borderProperty.Insert( "antiAliasing", true );
@@ -887,8 +867,8 @@ public: // From ItemFactory
     checkbox.SetZ( 0.1f );
 
     Property::Map solidColorProperty;
-    solidColorProperty.Insert( "rendererType", "colorRenderer" );
-    solidColorProperty.Insert( "blendColor", Vector4(0.f, 0.f, 0.f, 0.6f) );
+    solidColorProperty.Insert( "rendererType", "color" );
+    solidColorProperty.Insert( "mixColor", Vector4(0.f, 0.f, 0.f, 0.6f) );
     checkbox.SetProperty( ImageView::Property::IMAGE, solidColorProperty );
 
     if( MODE_REMOVE_MANY  != mMode &&
@@ -983,7 +963,7 @@ void RunTest(Application& app)
   app.MainLoop();
 }
 
-int main(int argc, char **argv)
+int DALI_EXPORT_API main(int argc, char **argv)
 {
   Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);