X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fgradients%2Fgradients-example.cpp;h=78480f6d16143311a575c5eb09c6c418b2ea4ddc;hb=b90419f6915253b19e0b8387a1da4e98aadf3964;hp=6ea9b15749980d026afb085046e07db31c825573;hpb=f1102b629cb64e9d96ebeaed0f1bc070e539e311;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/gradients/gradients-example.cpp b/examples/gradients/gradients-example.cpp index 6ea9b15..78480f6 100644 --- a/examples/gradients/gradients-example.cpp +++ b/examples/gradients/gradients-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,7 @@ */ #include -#include -#include +#include #include "shared/view.h" using namespace Dali; @@ -27,9 +26,9 @@ namespace { const char * const APPLICATION_TITLE( "Color Gradients" ); -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); -const char * const CHANGE_ICON( DALI_IMAGE_DIR "icon-change.png" ); -const char * const CHANGE_ICON_SELECTED( DALI_IMAGE_DIR "icon-change-selected.png" ); +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); +const char * const CHANGE_ICON( DEMO_IMAGE_DIR "icon-change.png" ); +const char * const CHANGE_ICON_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" ); } // This example shows how to render color gradients @@ -69,8 +68,8 @@ public: APPLICATION_TITLE ); PushButton changeButton = Toolkit::PushButton::New(); - changeButton.SetUnselectedImage( CHANGE_ICON ); - changeButton.SetSelectedImage( CHANGE_ICON_SELECTED ); + changeButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_ICON ); + changeButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_ICON_SELECTED ); changeButton.ClickedSignal().Connect( this, &GradientController::OnChangeIconClicked ); toolBar.AddControl( changeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, @@ -79,21 +78,23 @@ public: // ---- Gradient for background - mGradientMap.Insert("renderer-type", "gradient-renderer"); + mGradientMap.Insert( Toolkit::Visual::Property::TYPE, Visual::GRADIENT ); + Property::Array stopOffsets; stopOffsets.PushBack( 0.0f ); stopOffsets.PushBack( 0.3f ); stopOffsets.PushBack( 0.6f ); stopOffsets.PushBack( 0.8f ); - stopOffsets.PushBack( 1.f ); - mGradientMap.Insert("gradient-stop-offset", stopOffsets); + stopOffsets.PushBack( 1.0f ); + mGradientMap.Insert( GradientVisual::Property::STOP_OFFSET, stopOffsets ); + Property::Array stopColors; stopColors.PushBack( Vector4( 129.f, 198.f, 193.f, 255.f )/255.f ); stopColors.PushBack( Vector4( 196.f, 198.f, 71.f, 122.f )/255.f ); stopColors.PushBack( Vector4( 214.f, 37.f, 139.f, 191.f )/255.f ); stopColors.PushBack( Vector4( 129.f, 198.f, 193.f, 150.f )/255.f ); stopColors.PushBack( Color::YELLOW ); - mGradientMap.Insert("gradient-stop-color", stopColors); + mGradientMap.Insert( GradientVisual::Property::STOP_COLOR, stopColors ); OnChangeIconClicked( changeButton ); } @@ -106,30 +107,30 @@ public: { case 0: // linear gradient with units as objectBoundingBox { - gradientMap.Insert("gradient-start-position", Vector2( 0.5f, 0.5f )); - gradientMap.Insert("gradient-end-position", Vector2( -0.5f, -0.5f )); + gradientMap.Insert( GradientVisual::Property::START_POSITION, Vector2( 0.5f, 0.5f ) ); + gradientMap.Insert( GradientVisual::Property::END_POSITION, Vector2( -0.5f, -0.5f ) ); break; } case 1: // linear gradient with units as userSpaceOnUse { Vector2 halfStageSize = Stage::GetCurrent().GetSize()*0.5f; - gradientMap.Insert("gradient-start-position", halfStageSize); - gradientMap.Insert("gradient-end-position", -halfStageSize ); - gradientMap.Insert("gradient-units", "user-space"); + gradientMap.Insert( GradientVisual::Property::START_POSITION, halfStageSize ); + gradientMap.Insert( GradientVisual::Property::END_POSITION, -halfStageSize ); + gradientMap.Insert( GradientVisual::Property::UNITS, GradientVisual::Units::USER_SPACE ); break; } case 2: // radial gradient with units as objectBoundingBox { - gradientMap.Insert("gradient-center", Vector2(0.5f, 0.5f)); - gradientMap.Insert("gradient-radius", 1.414f); + gradientMap.Insert( GradientVisual::Property::CENTER, Vector2( 0.5f, 0.5f ) ); + gradientMap.Insert( GradientVisual::Property::RADIUS, 1.414f ); break; } default: // radial gradient with units as userSpaceOnUse { Vector2 stageSize = Stage::GetCurrent().GetSize(); - gradientMap.Insert("gradient-center", stageSize*0.5f); - gradientMap.Insert("gradient-radius", stageSize.Length()); - gradientMap.Insert("gradient-units", "user-space"); + gradientMap.Insert( GradientVisual::Property::CENTER, stageSize * 0.5f ); + gradientMap.Insert( GradientVisual::Property::RADIUS, stageSize.Length()); + gradientMap.Insert( GradientVisual::Property::UNITS, GradientVisual::Units::USER_SPACE ); break; } } @@ -141,13 +142,6 @@ public: return true; } - bool OnTouch( Actor actor, const TouchEvent& touch ) - { - // quit the application - mApplication.Quit(); - return true; - } - void OnKeyEvent(const KeyEvent& event) { if(event.state == KeyEvent::Down) @@ -167,20 +161,10 @@ private: unsigned mIndex; }; -void RunTest( Application& application ) +int DALI_EXPORT_API main( int argc, char **argv ) { + Application application = Application::New( &argc, &argv ); GradientController test( application ); - application.MainLoop(); -} - -// Entry point for Linux & Tizen applications -// -int main( int argc, char **argv ) -{ - Application application = Application::New( &argc, &argv ); - - RunTest( application ); - return 0; }