Changed colours on main demo to match the new logo

Change-Id: I45eb2a79f844539194940ab600532d2df76d45bd
Signed-off-by: David Steele <david.steele@partner.samsung.com>

diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp
index 9efa954e454ebb4fea790f14defa7a9f69bee738..02939272009db83488e8c319f4c5dc4bf108bcdf 100644 (file)
--- a/demo/dali-table-view.cpp
+++ b/demo/dali-table-view.cpp
@@ -37,7 +37,7 @@ const std::string BUTTON_QUIT( "Quit" );
 const std::string BUTTON_OK( "Ok" );
 const std::string BUTTON_CANCEL( "Cancel" );
 
-const std::string DEFAULT_BACKGROUND_IMAGE_PATH( DALI_IMAGE_DIR "background-default.png" );
+const std::string DEFAULT_BACKGROUND_IMAGE_PATH( DALI_IMAGE_DIR "background-gradient.jpg" );
 const std::string LOGO_PATH( DALI_IMAGE_DIR "dali-logo.png" );
 const std::string DEFAULT_TOOLBAR_IMAGE_PATH( DALI_IMAGE_DIR "top-bar-demo.png" );
 const std::string BUTTON_BACKGROUND(DALI_IMAGE_DIR "button-background.png");
@@ -865,7 +865,8 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count, BitmapImage dis
   for( int i = 0; i < count; ++i )
   {
     float randSize = Random::Range( 10.0f, 400.0f );
-    Vector4 randColour( 0.0f, Random::Range( 0.0f, 0.75f ), 1.0f, Random::Range( 0.3f, 0.6f ));
+    float hue = Random::Range( 0.3f, 1.0f );
+    Vector4 randColour( hue, hue*0.5, 0.0f, Random::Range( 0.3f, 0.6f ));
 
     ImageActor dfActor = ImageActor::New( distanceField );
     mBackgroundActors.push_back( dfActor );

diff --git a/demo/images/background-gradient.jpg b/demo/images/background-gradient.jpg
new file mode 100755 (executable)
index 0000000..49db017
Binary files /dev/null and b/demo/images/background-gradient.jpg differ

diff --git a/demo/images/dali-logo.png b/demo/images/dali-logo.png
index 3a34b60eea005813465e50755d08fdb5c5bf2ec7..ce6e284a66f96075eb7d4a21cefa489f629919cf 100644 (file)
Binary files a/demo/images/dali-logo.png and b/demo/images/dali-logo.png differ