[dali_2.1.16] Merge branch 'devel/master'

Change-Id: I053a4a2e4ad9c61490a0b45428dba9cfdae6bb0a

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 54ceab9..5f20ac9 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -17,6 +17,7 @@ endif()
 # Define options to CMake
 OPTION(ENABLE_EXPORTALL          "Enable Export all symbols" OFF)
 OPTION(ENABLE_DEBUG              "Enable Debug" OFF)
+OPTION(ENABLE_TRACE              "Enable Trace" OFF)
 OPTION(ENABLE_PKG_CONFIGURE      "Use pkgconfig" ON)
 OPTION(INTERNATIONALIZATION      "Internationalization demo string names" ON)
 
@@ -352,6 +353,10 @@ IF( ENABLE_DEBUG )
   SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DDEBUG_ENABLED")
 ENDIF()
 
+IF( ENABLE_TRACE )
+  SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DTRACE_ENABLED")
+ENDIF()
+
 IF( ENABLE_SCENE_LOADER )
   SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DDALI_SCENE_LOADER_AVAILABLE")
 ENDIF()

diff --git a/examples/buttons/buttons-example.cpp b/examples/buttons/buttons-example.cpp
index 502902f..b6249ee 100644 (file)
--- a/examples/buttons/buttons-example.cpp
+++ b/examples/buttons/buttons-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -28,7 +28,7 @@ using namespace Dali;
 
 namespace
 {
-const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg";
+const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-default.png";
 const char* const TOOLBAR_IMAGE    = DEMO_IMAGE_DIR "top-bar.png";
 
 const char* const TOOLBAR_TITLE = "Buttons";
@@ -44,20 +44,16 @@ const char* const BIG_IMAGE_3   = DEMO_IMAGE_DIR "gallery-large-13.jpg";
 
 const char* const ENABLED_IMAGE = DEMO_IMAGE_DIR "item-select-check.png";
 
-const Vector4 BACKGROUND_COLOUR(1.0f, 1.0f, 1.0f, 0.15f);
+const Vector4 BACKGROUND_COLOUR(0.25f, 0.25f, 0.25f, 0.15f);
 
 // Layout sizes
-const int RADIO_LABEL_THUMBNAIL_SIZE       = 60;
+const int RADIO_LABEL_THUMBNAIL_SIZE       = 50;
 const int RADIO_LABEL_THUMBNAIL_SIZE_SMALL = 40;
 const int RADIO_IMAGE_SPACING              = 8;
 const int BUTTON_HEIGHT                    = 48;
 
 const int MARGIN_SIZE   = 10;
 const int TOP_MARGIN    = 85;
-const int GROUP2_HEIGHT = 238;
-const int GROUP1_HEIGHT = 120;
-const int GROUP3_HEIGHT = 190;
-const int GROUP4_HEIGHT = BUTTON_HEIGHT + MARGIN_SIZE * 2;
 
 } // namespace
 

diff --git a/examples/popup/popup-example.cpp b/examples/popup/popup-example.cpp
index 4da3e3d..9fd6a84 100644 (file)
--- a/examples/popup/popup-example.cpp
+++ b/examples/popup/popup-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -33,7 +33,7 @@ struct ButtonItem
 
 namespace
 {
-const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg";
+const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-default.png";
 const char* const TOOLBAR_IMAGE    = DEMO_IMAGE_DIR "top-bar.png";
 
 const char* const TOOLBAR_TITLE = "Popup";

diff --git a/examples/size-negotiation/size-negotiation-example.cpp b/examples/size-negotiation/size-negotiation-example.cpp
index 0dc96e3..b1fffa3 100644 (file)
--- a/examples/size-negotiation/size-negotiation-example.cpp
+++ b/examples/size-negotiation/size-negotiation-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -34,7 +34,7 @@ struct ButtonItem
 
 namespace
 {
-const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg";
+const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-default.png";
 const char* const TOOLBAR_IMAGE    = DEMO_IMAGE_DIR "top-bar.png";
 const char* const IMAGE            = DEMO_IMAGE_DIR "background-magnifier.jpg";
 

diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp
index 83743c7..f04d074 100644 (file)
--- a/examples/text-label/text-label-example.cpp
+++ b/examples/text-label/text-label-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -253,11 +253,10 @@ public:
     mBorder.SetProperty(Actor::Property::VISIBLE, false);
     mGrabCorner.RaiseToTop();
 
-    mHueAngleIndex         = mLabel.RegisterProperty("hue", 0.0f);
-    Renderer bgRenderer    = mLabel.GetRendererAt(0);
-    mOverrideMixColorIndex = bgRenderer.GetPropertyIndex(ColorVisual::Property::MIX_COLOR);
+    mHueAngleIndex      = mLabel.RegisterProperty("hue", 0.0f);
+    Renderer bgRenderer = mLabel.GetRendererAt(0);
 
-    Constraint constraint = Constraint::New<Vector3>(bgRenderer, mOverrideMixColorIndex, HSVColorConstraint(0.0f, 0.5f, 0.8f));
+    Constraint constraint = Constraint::New<Vector3>(bgRenderer, VisualRenderer::Property::VISUAL_MIX_COLOR, HSVColorConstraint(0.0f, 0.5f, 0.8f));
     constraint.AddSource(Source(mLabel, mHueAngleIndex));
     constraint.SetRemoveAction(Constraint::DISCARD);
     constraint.Apply();

diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index 484fb2c..739d44e 100755 (executable)
--- a/packaging/com.samsung.dali-demo.spec
+++ b/packaging/com.samsung.dali-demo.spec
@@ -2,7 +2,7 @@
 
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    2.1.15
+Version:    2.1.16
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -92,6 +92,7 @@ cmake -DDALI_APP_DIR=%{dali_app_ro_dir}/bin \
 %if 0%{?enable_debug}
       -DCMAKE_BUILD_TYPE=Debug \
 %endif
+      -DENABLE_TRACE:BOOL=ON \
       -DLOCAL_STYLE_DIR=%{local_style_dir} \
       -DINTERNATIONALIZATION:BOOL=OFF \
       -DTIZEN:BOOL=ON \