From: Heeyong Song Date: Thu, 7 May 2020 05:53:42 +0000 (+0900) Subject: Merge branch 'devel/master' into tizen X-Git-Tag: submit/tizen/20200507.062648 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Fsubmit%2Ftizen%2F20200507.062648;hp=2398ad45b8201ef3d99cda24b1b6348db4139dde;p=platform%2Fcore%2Fuifw%2Fdali-demo.git Merge branch 'devel/master' into tizen Change-Id: Ie8a408d87e382f502bc3b63e2cadab25d743f5cc --- diff --git a/build/android/app/src/main/cpp/CMakeLists.txt b/build/android/app/src/main/cpp/CMakeLists.txt index fff12ab..c75ce8d 100644 --- a/build/android/app/src/main/cpp/CMakeLists.txt +++ b/build/android/app/src/main/cpp/CMakeLists.txt @@ -35,9 +35,9 @@ ELSE() ENDIF() IF(EXISTS "${DALI_ENV_DIR}") - PKG_CHECK_MODULES(DALI_CORE dali-core REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH) - PKG_CHECK_MODULES(DALI_ADAPTOR dali-adaptor REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH) - PKG_CHECK_MODULES(DALI_TOOLKIT dali-toolkit REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH) + PKG_CHECK_MODULES(DALI_CORE dali2-core REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH) + PKG_CHECK_MODULES(DALI_ADAPTOR dali2-adaptor REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH) + PKG_CHECK_MODULES(DALI_TOOLKIT dali2-toolkit REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH) ELSE() MESSAGE(WARNING "${DALI_ENV_DIR} not found!") ENDIF() diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 5899745..473ac76 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -166,9 +166,9 @@ ENDFOREACH(flag) MESSAGE("Installed style resources ${LOCAL_STYLE_IMAGES_LIST} to ${STYLE_DIR}/images") IF( ENABLE_PKG_CONFIGURE ) - SET(PKG_LIST dali-core - dali-adaptor - dali-toolkit) + SET(PKG_LIST dali2-core + dali2-adaptor + dali2-toolkit) INCLUDE(FindPkgConfig) pkg_check_modules(REQUIRED_PKGS REQUIRED ${PKG_LIST}) @@ -200,9 +200,9 @@ IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc. FIND_PACKAGE( unofficial-cairo REQUIRED ) FIND_PACKAGE( dali-windows-dependencies REQUIRED ) - FIND_PACKAGE( dali-core REQUIRED ) - FIND_PACKAGE( dali-adaptor REQUIRED ) - FIND_PACKAGE( dali-toolkit REQUIRED ) + FIND_PACKAGE( dali2-core REQUIRED ) + FIND_PACKAGE( dali2-adaptor REQUIRED ) + FIND_PACKAGE( dali2-toolkit REQUIRED ) # Set up the include dir SET( INCLUDE_DIR $ENV{includedir} ) @@ -238,9 +238,9 @@ IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc. unofficial::angle::libGLESv2 unofficial::cairo::cairo dali-windows-dependencies::dali-windows-dependencies - dali-core::dali-core - dali-adaptor::dali-adaptor - dali-toolkit::dali-toolkit + dali2-core::dali2-core + dali2-adaptor::dali2-adaptor + dali2-toolkit::dali2-toolkit ) ELSEIF( UNIX ) SET( REQUIRED_LIBS diff --git a/examples/image-view/image-view-example.cpp b/examples/image-view/image-view-example.cpp index afb3fe1..d9fbe33 100644 --- a/examples/image-view/image-view-example.cpp +++ b/examples/image-view/image-view-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -21,6 +21,7 @@ #include #include #include +#include using namespace Dali; @@ -34,6 +35,7 @@ const char* APPLICATION_TITLE( "Image view" ); const char* IMAGE_PATH[] = { DEMO_IMAGE_DIR "gallery-small-23.jpg", DEMO_IMAGE_DIR "woodEffect.jpg", + DEMO_IMAGE_DIR "wood.png", // 32bits image DEMO_IMAGE_DIR "heartsframe.9.png", DEMO_IMAGE_DIR "World.svg" }; @@ -43,6 +45,7 @@ const unsigned int NUMBER_OF_IMAGES = 3; enum CellPlacement { TOP_BUTTON, + MID_BUTTON, LOWER_BUTTON, IMAGE, NUMBER_OF_ROWS @@ -68,6 +71,8 @@ const unsigned int NUMBER_OF_RESOURCES = sizeof(IMAGE_PATH) / sizeof(char*); std::string EXAMPLE_INSTRUCTIONS = "Instructions: Change button cycles through different image visuals, " "on/off takes the ImageView and it's current visual on or off stage."; +const float CORNER_RADIUS_VALUE( 20.0f ); + } // namespace class ImageViewController: public ConnectionTracker @@ -110,6 +115,7 @@ class ImageViewController: public ConnectionTracker Vector3 offset( 0.9f, 0.70f, 0.0f ); mTable.SetSizeModeFactor( offset ); mTable.SetFitHeight(CellPlacement::TOP_BUTTON); + mTable.SetFitHeight(CellPlacement::MID_BUTTON); mTable.SetFitHeight(CellPlacement::LOWER_BUTTON); mContentLayer.Add( mTable ); @@ -142,7 +148,17 @@ class ImageViewController: public ConnectionTracker button2.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); button2.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); button2.SetName( s ); - mTable.AddChild( button2, Toolkit::TableView::CellPosition( CellPlacement::LOWER_BUTTON, x ) ); + mTable.AddChild( button2, Toolkit::TableView::CellPosition( CellPlacement::MID_BUTTON, x ) ); + + Toolkit::PushButton button3 = Toolkit::PushButton::New(); + button3.SetProperty( Toolkit::Button::Property::LABEL, "Round" ); + button3.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); + button3.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); + button3.ClickedSignal().Connect( this, &ImageViewController::RoundedCornerClicked ); + button3.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); + button3.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); + button3.SetName( s ); + mTable.AddChild( button3, Toolkit::TableView::CellPosition( CellPlacement::LOWER_BUTTON, x ) ); mImageViews[x] = Toolkit::ImageView::New( ); Property::Map imagePropertyMap; @@ -157,8 +173,9 @@ class ImageViewController: public ConnectionTracker mTable.AddChild( mImageViews[x], Toolkit::TableView::CellPosition( CellPlacement::IMAGE, x ) ); // Set changeable counter and toggle for each ImageView - mImageViewImageIndexStatus[x] = true; + mImageViewImageIndexStatus[x] = 0; mImageViewToggleStatus[x] = true; + mImageViewRoundedCornerStatus[x] = false; } Stage::GetCurrent().KeyEventSignal().Connect(this, &ImageViewController::OnKeyEvent); @@ -187,7 +204,7 @@ private: } else { - mTable.AddChild( imageView, Toolkit::TableView::CellPosition( 2, GetButtonIndex( button ) ) ); + mTable.AddChild( imageView, Toolkit::TableView::CellPosition( CellPlacement::IMAGE, GetButtonIndex( button ) ) ); } mImageViewToggleStatus[ buttonIndex ] = !mImageViewToggleStatus[ buttonIndex ]; @@ -199,19 +216,40 @@ private: { unsigned int buttonIndex = GetButtonIndex( button ); - if ( mImageViews[buttonIndex].OnStage() ) + if( mImageViews[buttonIndex].OnStage() ) { - Property::Map imagePropertyMap; - imagePropertyMap.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); - imagePropertyMap.Insert( Toolkit::ImageVisual::Property::URL, IMAGE_PATH[ mImageViewImageIndexStatus[buttonIndex] ] ); - mImageViews[buttonIndex].SetProperty(Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); - ++mImageViewImageIndexStatus[buttonIndex]; if( mImageViewImageIndexStatus[buttonIndex] == NUMBER_OF_RESOURCES ) { mImageViewImageIndexStatus[buttonIndex] = 0; } + + // Reset corner radius state value + mImageViewRoundedCornerStatus[buttonIndex] = false; + + Property::Map imagePropertyMap; + imagePropertyMap.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); + imagePropertyMap.Insert( Toolkit::ImageVisual::Property::URL, IMAGE_PATH[ mImageViewImageIndexStatus[buttonIndex] ] ); + mImageViews[buttonIndex].SetProperty(Toolkit::ImageView::Property::IMAGE , imagePropertyMap ); + } + return true; + } + + bool RoundedCornerClicked( Toolkit::Button button ) + { + unsigned int buttonIndex = GetButtonIndex( button ); + + if( mImageViews[buttonIndex].OnStage() ) + { + mImageViewRoundedCornerStatus[ buttonIndex ] = !mImageViewRoundedCornerStatus[ buttonIndex ]; + + Property::Map imagePropertyMap; + imagePropertyMap.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); + imagePropertyMap.Insert( Toolkit::ImageVisual::Property::URL, IMAGE_PATH[ mImageViewImageIndexStatus[buttonIndex] ] ); + imagePropertyMap.Insert( Toolkit::DevelVisual::Property::CORNER_RADIUS, mImageViewRoundedCornerStatus[buttonIndex] ? CORNER_RADIUS_VALUE : 0.0f ); + + mImageViews[buttonIndex].SetProperty( Toolkit::ImageView::Property::IMAGE, imagePropertyMap ); } return true; } @@ -239,6 +277,7 @@ private: Toolkit::TableView mTable; Toolkit::ImageView mImageViews[ NUMBER_OF_IMAGES ]; bool mImageViewToggleStatus[ NUMBER_OF_IMAGES ]; + bool mImageViewRoundedCornerStatus[ NUMBER_OF_IMAGES ]; unsigned int mImageViewImageIndexStatus[ NUMBER_OF_IMAGES ]; Toolkit::TableView::CellPosition mCurrentPositionToggle; diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index a703602..102542f 100755 --- 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: 1.5.8 +Version: 1.9.10 Release: 1 Group: System/Libraries License: Apache-2.0 @@ -18,9 +18,9 @@ BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(capi-media-player) BuildRequires: pkgconfig(dlog) BuildRequires: gettext-tools -BuildRequires: pkgconfig(dali-core) -BuildRequires: pkgconfig(dali-adaptor) -BuildRequires: pkgconfig(dali-toolkit) +BuildRequires: pkgconfig(dali2-core) +BuildRequires: pkgconfig(dali2-adaptor) +BuildRequires: pkgconfig(dali2-toolkit) BuildRequires: pkgconfig(libtzplatform-config) %description