The new test environment from Tizen is the Web-TCT test suite. This was written for testing web components, but can easily be used for testing Dali.
-Each of the DALi repositories, **dali-core**, **dali-adaptor** and **dali-toolkit**, have their own test suites under the `automated-tests` folder. Within the src folder are a number of secondary folders - these correspond to 'managed' tests (for testing the frozen API for products), unmanaged tests (tests for other APIs) and internal (for desktop testing only)
+Each of the DALi repositories, **dali-core**, **dali-adaptor** and **dali-toolkit**, have their own test suites under the `automated-tests` folder. Within the src folder are a number of secondary folders - these correspond to 'API' tests and internal (for desktop testing only)
Installation
------------
cd automated-tests
./build.sh
-This will build dali, dali-unmanaged and dali-internal test sets.
+This will build dali and dali-internal test sets.
Test sets can be built individually:
- ./build.sh dali-unmanaged
+ ./build.sh dali
They can also be built without regenerating test case scripts (Useful for quicker rebuilds)
./execute.sh
-This will execute dali, dali-unmanaged and dali-internal test sets. Note that the output summary for the first will be printed before running the second.
+This will execute dali and dali-internal test sets. Note that the output summary for the first will be printed before running the second.
By default the tests execute in parallel, which is faster but does not produce a single output file (summary.xml). Use this to execute the tests in series:
sudo ./tcbuild build dali
- sudo ./tcbuild build dali-unmanaged
+ sudo ./tcbuild build dali
./tcbuild install dali
- ./tcbuild install dali-unmanaged
For Dali Adaptor, cd into automated-tests, and use:
sudo ./tcbuild build dali-adaptor
- sudo ./tcbuild build dali-adaptor-unmanaged # < Currently failing as needs a ".spec" file.
sudo ./tcbuild build dali-platform-abstraction
./tcbuild install dali-adaptor
- ./tcbuild install dali-adaptor-unmanaged
./tcbuild install dali-platform-abstraction
Ensure your handset's filesystem is writable:
tct-mgr
-This will bring up the java test suite program. You should see the Plan pane with a list of all tests in. Select the tct-dali-core-tests and tct-dali-unmanaged-tests. and you will be offered a dialog to choose a test plan: either create a new one or use temp.
+This will bring up the java test suite program. You should see the Plan pane with a list of all tests in. Select the tct-dali-core-tests. and you will be offered a dialog to choose a test plan: either create a new one or use temp.
Select dali test suite, and click Run, then "Create a new plan", and call it "Dali-Core" or some such. It will now run the dali-test suite.
You can find the output files under /opt/tct/manager/result/
If you are adding test cases for new or existing managed API (CAPI), you need to add your changes to the src/dali mirror, and copy your change to the managed test suite in core-api. You need to inform HQ of your update.
-To Unmanaged API
-----------------
-
-If you are adding test cases for unmanaged API, you need to add your changes to the src/dali-unmanaged test suite.
-
For internal API
----------------
replace `<TestCase>` with the name of the failing testcase.
-For example, using testcase UtcDaliNinePatch01 from the dali-core unmanaged test suite:
+For example, using testcase UtcDaliNinePatch01 from the dali-core test suite:
- $ gdb build/src/dali-unmanaged/tct-dali-unmanaged-core
+ $ gdb build/src/dali/tct-dali-core
gdb> r UtcDaliNinePatch01
If the test results show that the test cases fail with "Undefined reference to XXX", it means you have probably failed to update the dali packages on target.
-If all the tests are failing then make sure that you have enabled the engineering mode on the target with the 'change-booting-mode.sh --update' command in sdb shell, as the tests may not have installed correctly.
+If all the tests are failing then make sure that you have enabled the engineering mode on the target with the 'change-booting-mode.sh --update' command in sdb shell, as the tests may not have installed correctly
+++ /dev/null
-%define MODULE_NAME dali-toolkit-unmanaged
-%define MODULE_LIBNAME dali-toolkit-unmanaged
-Name: core-%{MODULE_NAME}-tests
-Summary: Core API unit TC (%{name})
-Version: 0.1
-Release: 0
-Group: Development/Tools
-License: Apache License, Version 2.0, Samsung Properietary
-Source0: %{name}-%{version}.tar.gz
-Requires: dali
-Requires: dali-adaptor
-Requires: dali-toolkit
-BuildRequires: dali-integration-devel
-BuildRequires: pkgconfig(dali-core)
-BuildRequires: pkgconfig(dali)
-BuildRequires: pkgconfig(dali-toolkit)
-BuildRequires: libxml2-devel
-BuildRequires: cmake
-
-%description
-Core API unit TC (%{name})
-
-%prep
-%setup -q
-
-%build
-
-%define PREFIX "%{_libdir}/%{name}"
-
-export LDFLAGS+="-Wl,--rpath=%{PREFIX} -Wl,--as-needed"
-cd automated-tests
-cmake . -DMODULE="%{MODULE_NAME}" -DCMAKE_INSTALL_PREFIX=%{_prefix}
-
-make %{?jobs:-j%jobs}
-
-%install
-rm -rf %{buildroot}
-cd automated-tests
-%make_install
-mkdir -p %{buildroot}/opt/usr/share/license
-cp %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/opt/usr/share/license/%{name}
-mkdir -p %{buildroot}/tmp/
-cp %{_builddir}/%{name}-%{version}/automated-tests/scripts/add_all_smack_rule.sh %{buildroot}/tmp/
-cp %{_builddir}/%{name}-%{version}/automated-tests/scripts/all_smack.rule %{buildroot}/tmp/
-
-%post
-
-%postun
-
-
-%files
-/opt/usr/bin/*
-/opt/usr/share/license/%{name}
-/tmp/add_all_smack_rule.sh
-/tmp/all_smack.rule
+++ /dev/null
-%define MODULE_NAME dali-unmanaged
-%define MODULE_LIBNAME dali-unmanaged
-Name: core-%{MODULE_NAME}-tests
-Summary: Core API unit TC (%{name})
-Version: 0.1
-Release: 0
-Group: Development/Tools
-License: Apache License, Version 2.0, Samsung Properietary
-Source0: %{name}-%{version}.tar.gz
-Requires: dali
-BuildRequires: dali-devel
-BuildRequires: dali-integration-devel
-BuildRequires: pkgconfig(dali-core)
-BuildRequires: pkgconfig(dali)
-BuildRequires: libxml2-devel
-BuildRequires: cmake
-
-%description
-Core API unit TC (%{name})
-
-%prep
-%setup -q
-
-%build
-
-%define PREFIX "%{_libdir}/%{name}"
-
-export LDFLAGS+="-Wl,--rpath=%{PREFIX} -Wl,--as-needed"
-cd automated-tests
-cmake . -DMODULE="%{MODULE_NAME}" -DCMAKE_INSTALL_PREFIX=%{_prefix}
-
-make %{?jobs:-j%jobs}
-
-%install
-rm -rf %{buildroot}
-cd automated-tests
-%make_install
-mkdir -p %{buildroot}/opt/usr/share/license
-cp %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/opt/usr/share/license/%{name}
-mkdir -p %{buildroot}/tmp/
-cp %{_builddir}/%{name}-%{version}/automated-tests/scripts/add_all_smack_rule.sh %{buildroot}/tmp/
-cp %{_builddir}/%{name}-%{version}/automated-tests/scripts/all_smack.rule %{buildroot}/tmp/
-
-%post
-
-%postun
-
-
-%files
-/opt/usr/bin/*
-/opt/usr/share/license/%{name}
-/tmp/add_all_smack_rule.sh
-/tmp/all_smack.rule
INCLUDE_DIRECTORIES(
${${CAPI_LIB}_INCLUDE_DIRS}
../dali-toolkit/dali-toolkit-test-utils
- ../../../base
- ../../../optional
+ ../../../
)
ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
+++ /dev/null
-SET(PKG_NAME "dali-toolkit-unmanaged")
-
-SET(EXEC_NAME "tct-${PKG_NAME}-core")
-SET(RPM_NAME "core-${PKG_NAME}-tests")
-
-SET(CAPI_LIB "dali-toolkit-unmanaged")
-
-# List of test case sources (Only these get parsed for test cases)
-SET(TC_SOURCES
- utc-Dali-BendyEffect.cpp
- utc-Dali-BlindEffect.cpp
- utc-Dali-BloomView.cpp
- utc-Dali-Builder.cpp
- utc-Dali-CarouselEffect.cpp
- utc-Dali-CheckBoxButton.cpp
- utc-Dali-Cluster.cpp
- utc-Dali-CubeTransitionEffect.cpp
- utc-Dali-DepthLayout.cpp
- utc-Dali-DisplacementEffect.cpp
- utc-Dali-DistanceFieldEffect.cpp
- utc-Dali-GaussianBlurView.cpp
- utc-Dali-JsonParser.cpp
- utc-Dali-KeyInputFocusManager.cpp
- utc-Dali-NavigationControl.cpp
- utc-Dali-NavigationLayout.cpp
- utc-Dali-OverlayEffect.cpp
- utc-Dali-Page.cpp
- utc-Dali-PageTurnEffect.cpp
- utc-Dali-PageTurnView.cpp
- utc-Dali-RollLayout.cpp
- utc-Dali-ScrollView.cpp
- utc-Dali-ShadowView.cpp
- utc-Dali-ShearEffect.cpp
- utc-Dali-Slider.cpp
- utc-Dali-SoftButtonEffect.cpp
- utc-Dali-SpiralLayout.cpp
- utc-Dali-SpotEffect.cpp
- utc-Dali-SquareDissolveEffect.cpp
- utc-Dali-TableView.cpp
- utc-Dali-ToolBar.cpp
- utc-Dali-View.cpp
- utc-Dali-WaterEffect.cpp
- utc-Dali-Button.cpp
- utc-Dali-ControlImpl.cpp
- utc-Dali-DefaultControls.cpp
- utc-Dali-ItemView.cpp
- utc-Dali-KeyboardFocusManager.cpp
- utc-Dali-ScrollViewEffect.cpp
- utc-Dali-TextInput.cpp
- utc-Dali-StyleManager.cpp
- utc-Dali-RadioButton.cpp
-)
-
-# Append list of test harness files (Won't get parsed for test cases)
-LIST(APPEND TC_SOURCES
- ../dali-toolkit/dali-toolkit-test-utils/test-harness.cpp
- ../dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.cpp
- ../dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
- ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.cpp
- ../dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
- ../dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp
- ../dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp
- ../dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp
- ../dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp
- ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
- ../dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
- ../dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
- ../dali-toolkit/dali-toolkit-test-utils/test-application.cpp
- ../dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp
- ../dali-toolkit/dali-toolkit-test-utils/test-gesture-manager.cpp
- ../dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp
- ../dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.cpp
- ../dali-toolkit/dali-toolkit-test-utils/test-render-controller.cpp
- ../dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp
-)
-
-
-PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
- dali-core
- dali
- dali-toolkit
-)
-
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror=return-type")
-
-FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
- SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
-ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
-
-INCLUDE_DIRECTORIES(
- ${${CAPI_LIB}_INCLUDE_DIRS}
- ../dali-toolkit/dali-toolkit-test-utils
-)
-
-ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
-TARGET_LINK_LIBRARIES(${EXEC_NAME}
- ${${CAPI_LIB}_LIBRARIES}
-)
-
-INSTALL(PROGRAMS ${EXEC_NAME}
- DESTINATION ${BIN_DIR}/${EXEC_NAME}
-)
+++ /dev/null
-#include <string.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <test-harness.h>
-#include "tct-dali-toolkit-unmanaged-core.h"
-
-int main(int argc, char * const argv[])
-{
- int result = TestHarness::EXIT_STATUS_BAD_ARGUMENT;
-
- const char* optString = "r";
- bool optRerunFailed(false);
-
- int nextOpt = 0;
- do
- {
- nextOpt = getopt( argc, argv, optString );
- switch(nextOpt)
- {
- case 'r':
- optRerunFailed = true;
- break;
- case '?':
- TestHarness::Usage(argv[0]);
- exit(TestHarness::EXIT_STATUS_BAD_ARGUMENT);
- break;
- }
- } while( nextOpt != -1 );
-
- if( optind == argc ) // no testcase name in argument list
- {
- result = TestHarness::RunAllInParallel(argv[0], tc_array, optRerunFailed);
- }
- else
- {
- // optind is index of next argument - interpret as testcase name
- result = TestHarness::FindAndRunTestCase(tc_array, argv[optind]);
- }
- return result;
-}
+++ /dev/null
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <iostream>
-#include <stdlib.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali/integration-api/events/touch-event-integ.h>
-#include <dali-toolkit/dali-toolkit.h>
-
-using namespace Dali;
-using namespace Toolkit;
-
-void dali_button_startup(void)
-{
- test_return_value = TET_UNDEF;
-}
-
-void dali_button_cleanup(void)
-{
- test_return_value = TET_PASS;
-}
-
-
-namespace
-{
-const Dali::TouchPoint pointDownInside( 0, TouchPoint::Down, 240, 400 );
-const Dali::TouchPoint pointUpInside( 0, TouchPoint::Up, 240, 400 );
-const Dali::TouchPoint pointLeave( 0, TouchPoint::Leave, 240, 400 );
-const Dali::TouchPoint pointEnter( 0, TouchPoint::Motion, 240, 400 );
-const Dali::TouchPoint pointDownOutside( 0, TouchPoint::Down, 10, 10 );
-const Dali::TouchPoint pointUpOutside( 0, TouchPoint::Up, 10, 10 );
-
-static bool gObjectCreatedCallBackCalled;
-
-static void TestObjectCreatedCallback(BaseHandle handle)
-{
- gObjectCreatedCallBackCalled = true;
-}
-
-} // namespace
-
-
-
-// Positive test case for a method
-int UtcDaliButtonNew(void)
-{
- ToolkitTestApplication application;
- tet_infoline(" UtcDaliButtonNew");
-
- CheckBoxButton checkBoxButton = CheckBoxButton::New();
- DALI_TEST_CHECK( checkBoxButton );
-
- CheckBoxButton checkBoxButton2( checkBoxButton );
- DALI_TEST_CHECK( checkBoxButton2 );
- checkBoxButton2.Reset();
-
-
- //Additional check to ensure object is created by checking if it's registered
- ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
- DALI_TEST_CHECK( registry );
-
- gObjectCreatedCallBackCalled = false;
- registry.ObjectCreatedSignal().Connect( &TestObjectCreatedCallback );
- {
- CheckBoxButton checkBoxButton = CheckBoxButton::New();
- }
- DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
-
- gObjectCreatedCallBackCalled = false;
- registry.ObjectCreatedSignal().Connect( &TestObjectCreatedCallback );
- {
- PushButton pushButton = PushButton::New();
- }
- DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
-
- // Test down cast
- Handle handleButton = checkBoxButton;
- Button downCastCheckBoxButton = Button::DownCast( handleButton );
- DALI_TEST_CHECK( downCastCheckBoxButton );
- CheckBoxButton downCastCheckBoxButton2 = CheckBoxButton::DownCast( handleButton );
- DALI_TEST_CHECK( downCastCheckBoxButton2 );
- END_TEST;
-}
-
-int UtcDaliButtonProperties(void)
-{
- tet_infoline("UtcDaliButtonSetProperty: ");
- ToolkitTestApplication application;
-
- CheckBoxButton checkBoxButton = CheckBoxButton::New();
- PushButton pushButton = PushButton::New();
-
- //Test various properties
- checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("disabled"), false );
- DALI_TEST_CHECK( false == checkBoxButton.IsDisabled() );
-
- checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("disabled"), true );
- DALI_TEST_CHECK( true == checkBoxButton.IsDisabled() );
- END_TEST;
-}
-
-int UtcDaliButtonSetGetDimmed(void)
-{
- ToolkitTestApplication application;
- tet_infoline(" UtcDaliButtonSetGetDimmed");
-
- CheckBoxButton checkBoxButton = CheckBoxButton::New();
- checkBoxButton.SetDisabled( true );
-
- DALI_TEST_CHECK( checkBoxButton.IsDisabled() );
- checkBoxButton.SetDisabled( false );
-
- DALI_TEST_CHECK( !checkBoxButton.IsDisabled() );
- checkBoxButton.SetDisabled( true );
-
- DALI_TEST_CHECK( checkBoxButton.IsDisabled() );
- checkBoxButton.SetDisabled( false );
-
- DALI_TEST_CHECK( !checkBoxButton.IsDisabled() );
- END_TEST;
-}
+++ /dev/null
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <iostream>
-#include <stdlib.h>
-
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
-
-#include <dali/integration-api/events/key-event-integ.h>
-#include <dali/integration-api/events/mouse-wheel-event-integ.h>
-#include <dali/integration-api/events/long-press-gesture-event.h>
-#include <dali/integration-api/events/pinch-gesture-event.h>
-#include <dali/integration-api/events/pan-gesture-event.h>
-#include <dali/integration-api/events/tap-gesture-event.h>
-#include <dali/integration-api/events/touch-event-integ.h>
-
-#include "dummy-control.h"
-
-using namespace Dali;
-using namespace Dali::Toolkit;
-
-
-void control_impl_startup(void)
-{
- test_return_value = TET_UNDEF;
-}
-
-void control_impl_cleanup(void)
-{
- test_return_value = TET_PASS;
-}
-
-
-int UtcDaliControlImplTypeRegistry(void)
-{
- ToolkitTestApplication application;
-
- // Register Type
- TypeInfo type;
- type = TypeRegistry::Get().GetTypeInfo( "Control" );
- DALI_TEST_CHECK( type );
- BaseHandle handle = type.CreateInstance();
- DALI_TEST_CHECK( handle );
-
- // Check if it's a control
- DALI_TEST_CHECK( Control::DownCast(handle) );
- END_TEST;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-namespace
-{
-static bool MouseWheelEventCallback(Actor actor, const MouseWheelEvent& event)
-{
- return false;
-}
-}
-
-int UtcDaliControlImplMouseWheelEvent(void)
-{
- ToolkitTestApplication application;
-
- {
- DummyControl dummy = DummyControl::New( true );
- DummyControlImplOverride& dummyImpl = static_cast<DummyControlImplOverride&>(dummy.GetImplementation());
-
- dummy.SetSize(100.0f, 100.0f);
- dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(dummy);
-
- dummy.MouseWheelEventSignal().Connect(&MouseWheelEventCallback);
-
- application.Render();
- application.SendNotification();
- application.Render();
- application.SendNotification();
-
- DALI_TEST_EQUALS( dummyImpl.mouseWheelEventCalled, false, TEST_LOCATION );
-
- // simulate a mouse wheel event
- Vector2 screenCoordinates( 10.0f, 10.0f );
- Integration::MouseWheelEvent event(0, 0u, screenCoordinates, 1, 1000u);
- application.ProcessEvent(event);
- DALI_TEST_EQUALS( dummyImpl.mouseWheelEventCalled, true, TEST_LOCATION );
-
- Stage::GetCurrent().Remove(dummy);
- }
-
- // Ensure full code coverage
- {
- DummyControl dummy = DummyControl::New();
-
- dummy.SetSize(100.0f, 100.0f);
- dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(dummy);
-
- dummy.MouseWheelEventSignal().Connect(&MouseWheelEventCallback);
-
- application.Render();
- application.SendNotification();
- application.Render();
- application.SendNotification();
-
- // simulate a mouse wheel event
- Vector2 screenCoordinates( 20.0f, 20.0f );
- Integration::MouseWheelEvent event(0, 0u, screenCoordinates, 1, 1000u);
- application.ProcessEvent(event);
-
- Stage::GetCurrent().Remove(dummy);
- }
- END_TEST;
-}
+++ /dev/null
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <iostream>
-#include <stdlib.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
-
-using namespace Dali;
-using namespace Toolkit;
-
-void dali_default_controls_startup(void)
-{
- test_return_value = TET_UNDEF;
-}
-
-void dali_default_controls_cleanup(void)
-{
- test_return_value = TET_PASS;
-}
-
-
-
-int UtcDaliDefaultControlsCreateCheckBoxButton(void)
-{
- ToolkitTestApplication application;
-
- tet_infoline(" UtcDaliDefaultControlsCreateCheckBoxButton");
-
- const std::string imagePath( "Facke image path" );
- const std::string voidImagePath( "" );
-
- ImageActor image = CreateSolidColorActor( Color::RED );
- ImageActor voidImage;
-
- CheckBoxButton button0, button1, button2, button3, button4, button5;
-
- try
- {
- button0 = CreateCheckBoxButton( voidImagePath, voidImagePath, voidImagePath, voidImagePath );
- button1 = CreateCheckBoxButton( imagePath, voidImagePath, voidImagePath, voidImagePath );
- button2 = CreateCheckBoxButton( voidImagePath, imagePath, voidImagePath, voidImagePath );
- button3 = CreateCheckBoxButton( voidImagePath, voidImagePath, imagePath, voidImagePath );
- button4 = CreateCheckBoxButton( voidImagePath, voidImagePath, voidImagePath, imagePath );
- button5 = CreateCheckBoxButton( imagePath, imagePath, imagePath, imagePath );
- }
- catch( ... )
- {
- tet_result( TET_FAIL );
- }
-
- DALI_TEST_CHECK( button0 );
- DALI_TEST_CHECK( button1 );
- DALI_TEST_CHECK( button2 );
- DALI_TEST_CHECK( button3 );
- DALI_TEST_CHECK( button4 );
- DALI_TEST_CHECK( button5 );
-
- try
- {
- button0 = CreateCheckBoxButton( voidImage, voidImage, voidImage, voidImage );
- button1 = CreateCheckBoxButton( image, voidImage, voidImage, voidImage );
- button2 = CreateCheckBoxButton( voidImage, image, voidImage, voidImage );
- button3 = CreateCheckBoxButton( voidImage, voidImage, image, voidImage );
- button4 = CreateCheckBoxButton( voidImage, voidImage, voidImage, image );
- button5 = CreateCheckBoxButton( image, image, image, image );
- }
- catch( ... )
- {
- tet_result( TET_FAIL );
- }
-
- DALI_TEST_CHECK( button0 );
- DALI_TEST_CHECK( button1 );
- DALI_TEST_CHECK( button2 );
- DALI_TEST_CHECK( button3 );
- DALI_TEST_CHECK( button4 );
- DALI_TEST_CHECK( button5 );
-
- try
- {
- button0 = CreateCheckBoxButton( voidImagePath, voidImagePath );
- button1 = CreateCheckBoxButton( voidImagePath, imagePath );
- button2 = CreateCheckBoxButton( imagePath, voidImagePath );
- button3 = CreateCheckBoxButton( imagePath, imagePath );
- }
- catch( ... )
- {
- tet_result( TET_FAIL );
- }
-
- DALI_TEST_CHECK( button0 );
- DALI_TEST_CHECK( button1 );
- DALI_TEST_CHECK( button2 );
- DALI_TEST_CHECK( button3 );
-
- try
- {
- button0 = CreateCheckBoxButton( voidImage, voidImage );
- button2 = CreateCheckBoxButton( voidImage, image );
- button3 = CreateCheckBoxButton( voidImage, image );
- button4 = CreateCheckBoxButton( image, image );
- }
- catch( ... )
- {
- tet_result( TET_FAIL );
- }
-
- DALI_TEST_CHECK( button0 );
- DALI_TEST_CHECK( button1 );
- DALI_TEST_CHECK( button2 );
- DALI_TEST_CHECK( button3 );
- END_TEST;
-}
+++ /dev/null
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <iostream>
-#include <stdlib.h>
-#include <float.h> // for FLT_MAX
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
-
-using namespace Dali;
-using namespace Toolkit;
-
-namespace
-{
-const unsigned int TOTAL_ITEM_NUMBER = 100;
-const char* TEST_IMAGE_FILE_NAME = "gallery_image_01.jpg";
-
-
-// Implementation of ItemFactory for providing actors to ItemView
-class TestItemFactory : public ItemFactory
-{
-public:
-
- /**
- * Constructor
- * @param application class, stored as reference
- */
- TestItemFactory()
- {
- }
-
-public: // From ItemFactory
-
- /**
- * Query the number of items available from the factory.
- * The maximum available item has an ID of GetNumberOfItems() - 1.
- */
- virtual unsigned int GetNumberOfItems()
- {
- return TOTAL_ITEM_NUMBER;
- }
-
- /**
- * Create an Actor to represent a visible item.
- * @param itemId
- * @return the created actor.
- */
- virtual Actor NewItem(unsigned int itemId)
- {
- // Create an image actor for this item
- Image image = Image::New( TEST_IMAGE_FILE_NAME );
- Actor actor = ImageActor::New(image);
-
- return actor;
- }
-};
-
-} // namespace
-
-
-
-int UtcDaliItemViewAddAndGetLayout(void)
-{
- ToolkitTestApplication application;
-
- // Create the ItemView actor
- TestItemFactory factory;
- ItemView view = ItemView::New(factory);
-
- // Create a grid layout and add it to ItemView
- GridLayoutPtr gridLayout = GridLayout::New();
- view.AddLayout(*gridLayout);
-
- // As we have added one layout, check the number of layout is now 1
- DALI_TEST_CHECK(view.GetLayoutCount() == 1);
-
- // Create a depth layout and add it to ItemView
- DepthLayoutPtr depthLayout = DepthLayout::New();
- view.AddLayout(*depthLayout);
-
- // As we have added another layout, check the number of layout is now 2
- DALI_TEST_CHECK(view.GetLayoutCount() == 2);
-
- // Create a spiral layout and add it to ItemView
- SpiralLayoutPtr spiralLayout = SpiralLayout::New();
- view.AddLayout(*spiralLayout);
-
- // As we have added another layout, check the number of layout is now 3
- DALI_TEST_CHECK(view.GetLayoutCount() == 3);
-
- // Check we are getting the correct layout from ItemView
- DALI_TEST_CHECK(view.GetLayout(0) == gridLayout);
- DALI_TEST_CHECK(view.GetLayout(1) == depthLayout);
- DALI_TEST_CHECK(view.GetLayout(2) == spiralLayout);
- END_TEST;
-}
-
-int UtcDaliItemViewAddAndRemoveLayout(void)
-{
- ToolkitTestApplication application;
-
- // Create the ItemView actor
- TestItemFactory factory;
- ItemView view = ItemView::New(factory);
-
- // Create a grid layout and add it to ItemView
- GridLayoutPtr gridLayout = GridLayout::New();
- view.AddLayout(*gridLayout);
-
- // As we have added one layout, check the number of layout is now 1
- DALI_TEST_CHECK(view.GetLayoutCount() == 1);
-
- // Create a depth layout and add it to ItemView
- DepthLayoutPtr depthLayout = DepthLayout::New();
- view.AddLayout(*depthLayout);
-
- // As we have added another layout, check the number of layout is now 2
- DALI_TEST_CHECK(view.GetLayoutCount() == 2);
-
- // Check we are getting the correct layout from ItemView
- DALI_TEST_CHECK(view.GetLayout(0) == gridLayout);
- DALI_TEST_CHECK(view.GetLayout(1) == depthLayout);
-
- // Remove the grid layout
- view.RemoveLayout(0);
-
- // As we have removed the grid layout, check the number of layout is now 1
- DALI_TEST_CHECK(view.GetLayoutCount() == 1);
-
- // Check we are getting the correct layout from ItemView
- DALI_TEST_CHECK(view.GetLayout(0) == depthLayout);
-
- // Remove the depth layout
- view.RemoveLayout(0);
-
- // As we also removed the depth layout, check the number of layout is now 0
- DALI_TEST_CHECK(view.GetLayoutCount() == 0);
- END_TEST;
-}
-
-int UtcDaliItemViewActivateLayoutAndGetActiveLayout(void)
-{
- ToolkitTestApplication application;
-
- // Create the ItemView actor
- TestItemFactory factory;
- ItemView view = ItemView::New(factory);
-
- // Create a grid layout and add it to ItemView
- GridLayoutPtr gridLayout = GridLayout::New();
- view.AddLayout(*gridLayout);
-
- // Create a depth layout and add it to ItemView
- DepthLayoutPtr depthLayout = DepthLayout::New();
- view.AddLayout(*depthLayout);
-
- // Create a spiral layout and add it to ItemView
- SpiralLayoutPtr spiralLayout = SpiralLayout::New();
- view.AddLayout(*spiralLayout);
-
- // As we have added three layouts, check the number of layout is now 3
- DALI_TEST_CHECK(view.GetLayoutCount() == 3);
-
- // Check there is no active layout at the moment
- DALI_TEST_CHECK(view.GetActiveLayout() == NULL);
-
- // Activate the depth layout
- Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
- view.ActivateLayout(1, stageSize, 0.5f);
-
- // Check the current active layout is the depth layout
- DALI_TEST_CHECK(view.GetActiveLayout() == depthLayout);
-
- // Activate the grid layout
- view.ActivateLayout(0, stageSize, 0.5f);
-
- // Check the current active layout is the grid layout
- DALI_TEST_CHECK(view.GetActiveLayout() == gridLayout);
-
- // Activate the spiral layout
- view.ActivateLayout(2, stageSize, 0.5f);
-
- // Check the current active layout is the spiral layout
- DALI_TEST_CHECK(view.GetActiveLayout() == spiralLayout);
- END_TEST;
-}
+++ /dev/null
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <iostream>
-#include <stdlib.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
-#include <dali/integration-api/events/key-event-integ.h>
-
-
-using namespace Dali;
-using namespace Dali::Toolkit;
-
-void dali_keyboard_focus_manager_startup(void)
-{
- test_return_value = TET_UNDEF;
-}
-
-void dali_keyboard_focus_manager_cleanup(void)
-{
- test_return_value = TET_PASS;
-}
-
-
-namespace
-{
-
-// Functors to test whether PreFocusChange signal is emitted when the keyboard focus is about to change
-class PreFocusChangeCallback : public Dali::ConnectionTracker
-{
-public:
- PreFocusChangeCallback(bool& signalReceived)
- : mSignalVerified(signalReceived),
- mCurrentFocusedActor(),
- mProposedActorToFocus(),
- mDirection(Control::Left)
- {
- }
-
- Actor Callback(Actor currentFocusedActor, Actor proposedActorToFocus, Control::KeyboardFocusNavigationDirection direction)
- {
- tet_infoline("Verifying PreFocusChangeCallback()");
-
- mSignalVerified = true;
-
- mCurrentFocusedActor = currentFocusedActor;
- mProposedActorToFocus = proposedActorToFocus;
- mDirection = direction;
-
- return mProposedActorToFocus;
- }
-
- void Reset()
- {
- mSignalVerified = false;
- mCurrentFocusedActor = Actor();
- mProposedActorToFocus = Actor();
- mDirection = Control::Left;
- }
-
- bool& mSignalVerified;
- Actor mCurrentFocusedActor;
- Actor mProposedActorToFocus;
- Control::KeyboardFocusNavigationDirection mDirection;
-};
-
-// Functors to test whether focus changed signal is emitted when the keyboard focus is changed
-class FocusChangedCallback : public Dali::ConnectionTracker
-{
-public:
- FocusChangedCallback(bool& signalReceived)
- : mSignalVerified(signalReceived),
- mOriginalFocusedActor(),
- mCurrentFocusedActor()
- {
- }
-
- void Callback(Actor originalFocusedActor, Actor currentFocusedActor)
- {
- tet_infoline("Verifying FocusChangedCallback()");
-
- if(originalFocusedActor == mCurrentFocusedActor)
- {
- mSignalVerified = true;
- }
-
- mOriginalFocusedActor = originalFocusedActor;
- mCurrentFocusedActor = currentFocusedActor;
- }
-
- void Reset()
- {
- mSignalVerified = false;
- }
-
- bool& mSignalVerified;
- Actor mOriginalFocusedActor;
- Actor mCurrentFocusedActor;
-};
-
-// Functors to test whether focus group changed signal is emitted when the keyboard focus group is changed
-class FocusGroupChangedCallback : public Dali::ConnectionTracker
-{
-public:
- FocusGroupChangedCallback(bool& signalReceived)
- : mSignalVerified(signalReceived),
- mCurrentFocusedActor(),
- mForward(true)
- {
- }
-
- void Callback(Actor currentFocusedActor, bool forward)
- {
- tet_infoline("Verifying FocusGroupChangedCallback()");
-
- mSignalVerified = true;
-
- mCurrentFocusedActor = currentFocusedActor;
- mForward = forward;
- }
-
- void Reset()
- {
- mSignalVerified = false;
- }
-
- bool& mSignalVerified;
- Actor mCurrentFocusedActor;
- bool mForward;
-};
-
-// Functors to test whether focused actor activated signal is emitted when the focused actor is activated
-class FocusedActorActivatedCallback : public Dali::ConnectionTracker
-{
-public:
- FocusedActorActivatedCallback(bool& signalReceived)
- : mSignalVerified(signalReceived),
- mActivatedActor()
- {
- }
-
- void Callback(Actor activatedActor)
- {
- tet_infoline("Verifying FocusedActorActivatedCallback()");
-
- mSignalVerified = true;
-
- mActivatedActor = activatedActor;
- }
-
- void Reset()
- {
- mSignalVerified = false;
- }
-
- bool& mSignalVerified;
- Actor mActivatedActor;
-};
-
-} // namespace
-
-
-
-int UtcDaliKeyboardFocusManagerGet(void)
-{
- ToolkitTestApplication application;
-
- tet_infoline(" UtcDaliKeyboardKeyboardFocusManagerGet");
-
- // Register Type
- TypeInfo type;
- type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
- DALI_TEST_CHECK( type );
- BaseHandle handle = type.CreateInstance();
- DALI_TEST_CHECK( handle );
-
- KeyboardFocusManager manager;
-
- manager = KeyboardFocusManager::Get();
- DALI_TEST_CHECK(manager);
-
- KeyboardFocusManager newManager = KeyboardFocusManager::Get();
- DALI_TEST_CHECK(newManager);
-
- // Check that focus manager is a singleton
- DALI_TEST_CHECK(manager == newManager);
- END_TEST;
-}
-
-
-
-int UtcDaliKeyboardFocusManagerMoveFocus(void)
-{
- ToolkitTestApplication application;
-
- tet_infoline(" UtcDaliKeyboardFocusManagerMoveFocus");
-
- // Register Type
- TypeInfo type;
- type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
- DALI_TEST_CHECK( type );
- BaseHandle handle = type.CreateInstance();
- DALI_TEST_CHECK( handle );
-
- KeyboardFocusManager manager = KeyboardFocusManager::Get();
- DALI_TEST_CHECK(manager);
-
- bool preFocusChangeSignalVerified = false;
- PreFocusChangeCallback preFocusChangeCallback(preFocusChangeSignalVerified);
- manager.PreFocusChangeSignal().Connect( &preFocusChangeCallback, &PreFocusChangeCallback::Callback );
-
- bool focusChangedSignalVerified = false;
- FocusChangedCallback focusChangedCallback(focusChangedSignalVerified);
- manager.FocusChangedSignal().Connect( &focusChangedCallback, &FocusChangedCallback::Callback );
-
- // Create the first actor and add it to the stage
- Actor first = Actor::New();
- first.SetKeyboardFocusable(true);
- Stage::GetCurrent().Add(first);
-
- // Create the second actor and add it to the stage
- Actor second = Actor::New();
- second.SetKeyboardFocusable(true);
- Stage::GetCurrent().Add(second);
-
- // Move the focus to the right
- DALI_TEST_CHECK(manager.MoveFocus(Control::Right) == false);
-
- // Because no layout control in the stage and no actor is focused, it should emit the PreFocusChange signal
- DALI_TEST_CHECK(preFocusChangeCallback.mSignalVerified);
- DALI_TEST_CHECK(preFocusChangeCallback.mCurrentFocusedActor == Actor());
- DALI_TEST_CHECK(preFocusChangeCallback.mProposedActorToFocus == Actor());
- DALI_TEST_CHECK(preFocusChangeCallback.mDirection == Control::Right);
- preFocusChangeCallback.Reset();
-
- // Check that the focus is set on the first actor
- DALI_TEST_CHECK(manager.SetCurrentFocusActor(first) == true);
- DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
- DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
- DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == Actor());
- DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
- focusChangedCallback.Reset();
-
- // Move the focus towards right
- DALI_TEST_CHECK(manager.MoveFocus(Control::Right) == false);
-
- // Because no layout control in the stage and the first actor is focused, it should emit the PreFocusChange signal
- DALI_TEST_CHECK(preFocusChangeCallback.mSignalVerified);
- DALI_TEST_CHECK(preFocusChangeCallback.mCurrentFocusedActor == first);
- DALI_TEST_CHECK(preFocusChangeCallback.mProposedActorToFocus == Actor());
- DALI_TEST_CHECK(preFocusChangeCallback.mDirection == Control::Right);
- preFocusChangeCallback.Reset();
-
- // Check that the focus is set on the second actor
- DALI_TEST_CHECK(manager.SetCurrentFocusActor(second) == true);
- DALI_TEST_CHECK(manager.GetCurrentFocusActor() == second);
- DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
- DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
- DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == second);
- focusChangedCallback.Reset();
-
- // Move the focus towards up
- DALI_TEST_CHECK(manager.MoveFocus(Control::Up) == false);
-
- // Because no layout control in the stage and no actor is focused, it should emit the PreFocusChange signal
- DALI_TEST_CHECK(preFocusChangeCallback.mSignalVerified);
- DALI_TEST_CHECK(preFocusChangeCallback.mCurrentFocusedActor == second);
- DALI_TEST_CHECK(preFocusChangeCallback.mProposedActorToFocus == Actor());
- DALI_TEST_CHECK(preFocusChangeCallback.mDirection == Control::Up);
- preFocusChangeCallback.Reset();
- DALI_TEST_CHECK(!focusChangedCallback.mSignalVerified);
-
- // Create a 2x2 table view and try to move focus inside it
- TableView tableView = TableView::New( 2, 2 );
- Stage::GetCurrent().Add(tableView);
-
- // Create the third actor
- Actor third = Actor::New();
- third.SetKeyboardFocusable(true);
-
- // Create the fourth actor
- Actor fourth = Actor::New();
- fourth.SetKeyboardFocusable(true);
-
- // Add the four children to table view
- tableView.AddChild(first, TableView::CellPosition(0, 0));
- tableView.AddChild(second, TableView::CellPosition(0, 1));
- tableView.AddChild(third, TableView::CellPosition(1, 0));
- tableView.AddChild(fourth, TableView::CellPosition(1, 1));
-
- // Set the focus to the first actor
- DALI_TEST_CHECK(manager.SetCurrentFocusActor(first) == true);
- DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
- DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
- DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == second);
- DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
- focusChangedCallback.Reset();
-
- // Move the focus towards right
- DALI_TEST_CHECK(manager.MoveFocus(Control::Right) == true);
- DALI_TEST_CHECK(manager.GetCurrentFocusActor() == second);
- DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
- DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
- DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == second);
- focusChangedCallback.Reset();
-
- // Move the focus towards down
- DALI_TEST_CHECK(manager.MoveFocus(Control::Down) == true);
- DALI_TEST_CHECK(manager.GetCurrentFocusActor() == fourth);
- DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
- DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == second);
- DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == fourth);
- focusChangedCallback.Reset();
-
- // Move the focus towards left
- DALI_TEST_CHECK(manager.MoveFocus(Control::Left) == true);
- DALI_TEST_CHECK(manager.GetCurrentFocusActor() == third);
- DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
- DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == fourth);
- DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == third);
- focusChangedCallback.Reset();
-
- // Move the focus towards up
- DALI_TEST_CHECK(manager.MoveFocus(Control::Up) == true);
- DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
- DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
- DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == third);
- DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
- focusChangedCallback.Reset();
-
- // Move the focus towards left. The focus move will fail as no way to move it upwards
- DALI_TEST_CHECK(manager.MoveFocus(Control::Left) == false);
- DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
- DALI_TEST_CHECK(preFocusChangeCallback.mSignalVerified);
- DALI_TEST_CHECK(preFocusChangeCallback.mCurrentFocusedActor == first);
- DALI_TEST_CHECK(preFocusChangeCallback.mProposedActorToFocus == Actor());
- DALI_TEST_CHECK(preFocusChangeCallback.mDirection == Control::Left);
- preFocusChangeCallback.Reset();
- DALI_TEST_CHECK(!focusChangedCallback.mSignalVerified);
-
- // Enable the loop
- manager.SetFocusGroupLoop(true);
- DALI_TEST_CHECK(manager.GetFocusGroupLoop() == true);
-
- // Move the focus towards left again. The focus should move to the fourth actor.
- DALI_TEST_CHECK(manager.MoveFocus(Control::Left) == true);
- DALI_TEST_CHECK(manager.GetCurrentFocusActor() == fourth);
- DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
- DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
- DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == fourth);
- focusChangedCallback.Reset();
- END_TEST;
-}
-
-
-int UtcDaliKeyboardFocusManagerSignalFocusGroupChanged(void)
-{
- ToolkitTestApplication application;
-
- tet_infoline(" UtcDaliKeyboardFocusManagerSignalFocusGroupChanged");
-
- // Register Type
- TypeInfo type;
- type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
- DALI_TEST_CHECK( type );
- BaseHandle handle = type.CreateInstance();
- DALI_TEST_CHECK( handle );
-
- KeyboardFocusManager manager = KeyboardFocusManager::Get();
- DALI_TEST_CHECK(manager);
-
- bool focusGroupChangedSignalVerified = false;
- FocusGroupChangedCallback focusGroupChangedCallback(focusGroupChangedSignalVerified);
- manager.FocusGroupChangedSignal().Connect( &focusGroupChangedCallback, &FocusGroupChangedCallback::Callback );
-
- Integration::KeyEvent tabEvent("Tab", "", 0, 0, 0, Integration::KeyEvent::Down);
- Integration::KeyEvent shiftTabEvent("Tab", "", 0, 1, 0, Integration::KeyEvent::Down);
-
- // Send the tab event to change focus group in the forward direction
- application.ProcessEvent(tabEvent);
- DALI_TEST_CHECK(focusGroupChangedCallback.mSignalVerified);
- DALI_TEST_CHECK(focusGroupChangedCallback.mCurrentFocusedActor == Actor());
- DALI_TEST_CHECK(focusGroupChangedCallback.mForward == true);
- focusGroupChangedCallback.Reset();
-
- // Send the shift tab event to change focus group in the backward direction
- application.ProcessEvent(shiftTabEvent);
- DALI_TEST_CHECK(focusGroupChangedCallback.mSignalVerified);
- DALI_TEST_CHECK(focusGroupChangedCallback.mCurrentFocusedActor == Actor());
- DALI_TEST_CHECK(focusGroupChangedCallback.mForward == false);
- focusGroupChangedCallback.Reset();
- END_TEST;
-}
+++ /dev/null
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <iostream>
-
-#include <stdlib.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
-#include <dali/integration-api/events/touch-event-integ.h>
-#include <dali/integration-api/events/pan-gesture-event.h>
-
-
-using namespace Dali;
-using namespace Toolkit;
-
-void dali_scroll_view_effect_startup(void)
-{
- test_return_value = TET_UNDEF;
-}
-
-void dali_scroll_view_effect_cleanup(void)
-{
- test_return_value = TET_PASS;
-}
-
-namespace
-{
-
-const int MILLISECONDS_PER_SECOND = 1000;
-const int RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS)
-const int RENDER_ANIMATION_TEST_DURATION_MS = 1000; ///< 1000ms to test animation
-const int RENDER_DELAY_SCROLL = 1000; ///< duration to wait for any scroll to complete.
-
-/*
- * Simulate time passed by.
- *
- * @note this will always process at least 1 frame (1/60 sec)
- *
- * @param application Test application instance
- * @param duration Time to pass in milliseconds.
- * @return The actual time passed in milliseconds
- */
-int Wait(ToolkitTestApplication& application, int duration = 0)
-{
- int time = 0;
-
- for(int i = 0; i <= ( duration / RENDER_FRAME_INTERVAL); i++)
- {
- application.SendNotification();
- application.Render(RENDER_FRAME_INTERVAL);
- time += RENDER_FRAME_INTERVAL;
- }
-
- return time;
-}
-
-/**
- * Creates a Ruler that snaps to a specified grid size.
- * If that grid size is 0.0 then this ruler does not
- * snap.
- *
- * @param[in] gridSize (optional) The grid size for the ruler,
- * (Default = 0.0 i.e. no snapping)
- * @return The ruler is returned.
- */
-RulerPtr CreateRuler(float gridSize = 0.0f)
-{
- if(gridSize <= Math::MACHINE_EPSILON_0)
- {
- return new DefaultRuler();
- }
- return new FixedRuler(gridSize);
-}
-
-// Callback probes.
-
-static bool gOnScrollStartCalled; ///< Whether the OnScrollStart signal was invoked.
-static bool gOnScrollUpdateCalled; ///< Whether the OnScrollUpdate signal was invoked.
-static bool gOnScrollCompleteCalled; ///< Whether the OnScrollComplete signal was invoked.
-static Vector3 gConstraintResult; ///< Result from constraint.
-
-static ActorContainer gPages; ///< Keeps track of all the pages for applying effects.
-
-static void ResetScrollCallbackResults()
-{
- gOnScrollStartCalled = false;
- gOnScrollUpdateCalled = false;
- gOnScrollCompleteCalled = false;
-}
-
-/**
- * Invoked when scrolling starts.
- *
- * @param[in] position The current scroll position.
- */
-static void OnScrollStart( const Vector3& position )
-{
- gOnScrollStartCalled = true;
-}
-
-/**
- * Invoked when scrolling updates (via dragging)
- *
- * @param[in] position The current scroll position.
- */
-static void OnScrollUpdate( const Vector3& position )
-{
- gOnScrollUpdateCalled = true;
-}
-
-/**
- * Invoked when scrolling finishes
- *
- * @param[in] position The current scroll position.
- */
-static void OnScrollComplete( const Vector3& position )
-{
- gOnScrollCompleteCalled = true;
-}
-
-
-ScrollView SetupTestScrollView(int rows, int columns, Vector2 size)
-{
- ScrollView scrollView = ScrollView::New();
- scrollView.SetSize(size);
- scrollView.SetAnchorPoint(AnchorPoint::CENTER);
- scrollView.SetParentOrigin(ParentOrigin::CENTER);
- scrollView.ApplyConstraint( Constraint::New<Dali::Vector3>( Dali::Actor::SIZE, Dali::ParentSource( Dali::Actor::SIZE ), Dali::EqualToConstraint() ) );
- scrollView.SetWrapMode(false);
- scrollView.ScrollStartedSignal().Connect( &OnScrollStart );
- scrollView.ScrollUpdatedSignal().Connect( &OnScrollUpdate );
- scrollView.ScrollCompletedSignal().Connect( &OnScrollComplete );
- Stage::GetCurrent().Add( scrollView );
- RulerPtr rulerX = CreateRuler(size.width);
- RulerPtr rulerY = CreateRuler(size.height);
- if(columns > 1)
- {
- rulerX->SetDomain(RulerDomain(0.0f, size.width * columns));
- }
- else
- {
- rulerX->Disable();
- }
- if(rows > 1)
- {
- rulerY->SetDomain(RulerDomain(0.0f, size.width * rows));
- }
- else
- {
- rulerY->Disable();
- }
-
- scrollView.SetRulerX( rulerX );
- scrollView.SetRulerY( rulerY );
- Stage::GetCurrent().Add( scrollView );
-
- Actor container = Actor::New();
- container.SetParentOrigin(ParentOrigin::CENTER);
- container.SetAnchorPoint(AnchorPoint::CENTER);
- container.SetSize( size );
- scrollView.Add( container );
- container.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
-
- gPages.clear();
- for(int row = 0;row<rows;row++)
- {
- for(int column = 0;column<columns;column++)
- {
- Actor page = Actor::New();
- page.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
- page.SetParentOrigin( ParentOrigin::CENTER );
- page.SetAnchorPoint( AnchorPoint::CENTER );
- page.SetPosition( column * size.x, row * size.y );
- container.Add(page);
-
- gPages.push_back(page);
- }
- }
-
- ResetScrollCallbackResults();
- return scrollView;
-}
-
-void CleanupTest()
-{
- gPages.clear();
- ResetScrollCallbackResults();
-}
-
-Actor AddActorToPage(Actor page, float x, float y, float cols, float rows)
-{
- Stage stage = Stage::GetCurrent();
- Vector2 stageSize = stage.GetSize();
-
- const float margin = 10.0f;
- const Vector2 actorSize((stageSize.x / cols) - margin, (stageSize.y / rows) - margin);
-
- Actor actor = Actor::New();
- actor.SetParentOrigin( ParentOrigin::CENTER );
- actor.SetAnchorPoint( AnchorPoint::CENTER );
-
- Vector3 position( margin * 0.5f + (actorSize.x + margin) * x - stageSize.width * 0.5f,
- margin * 0.5f + (actorSize.y + margin) * y - stageSize.height * 0.5f,
- 0.0f);
- Vector3 positionEnd( margin * 0.5f + (actorSize.x + margin) * (x + cols) - stageSize.width * 0.5f - margin,
- margin * 0.5f + (actorSize.y + margin) * (y + rows) - stageSize.height * 0.5f - margin,
- 0.0f);
- Vector3 size(positionEnd - position);
- actor.SetPosition( position + size * 0.5f);
- actor.SetSize( positionEnd - position );
- page.Add(actor);
- return actor;
-}
-
-} // unnamed namespace
-
-
-int UtcDaliScrollViewPageCubeEffectSetup(void)
-{
- tet_infoline(" UtcDaliScrollViewPageCubeEffectSetup");
-
- ScrollViewPageCubeEffect effect;
-
- DALI_TEST_CHECK( !effect );
-
- BaseHandle handle = ScrollViewPageCubeEffect::New();
-
- DALI_TEST_CHECK( handle );
-
- effect = ScrollViewPageCubeEffect::DownCast(handle);
-
- DALI_TEST_CHECK( effect );
- END_TEST;
-}
-
-
-int UtcDaliScrollViewPageCarouselEffectSetup(void)
-{
- tet_infoline(" UtcDaliScrollViewCarouselEffectSetup");
-
- ScrollViewPageCarouselEffect effect;
-
- DALI_TEST_CHECK( !effect );
-
- BaseHandle handle = ScrollViewPageCarouselEffect::New();
-
- DALI_TEST_CHECK( handle );
-
- effect = ScrollViewPageCarouselEffect::DownCast(handle);
-
- DALI_TEST_CHECK( effect );
- END_TEST;
-}
-
-int UtcDaliScrollViewCarouselEffectSetup(void)
-{
- tet_infoline(" UtcDaliScrollViewCarouselEffectSetup");
-
- ScrollViewCarouselEffect effect;
-
- DALI_TEST_CHECK( !effect );
-
- BaseHandle handle = ScrollViewCarouselEffect::New();
-
- DALI_TEST_CHECK( handle );
-
- effect = ScrollViewCarouselEffect::DownCast(handle);
-
- DALI_TEST_CHECK( effect );
- END_TEST;
-}
-
-int UtcDaliScrollViewDepthEffectSetup(void)
-{
- tet_infoline(" UtcDaliScrollViewDepthEffectSetup");
-
- ScrollViewDepthEffect effect;
-
- DALI_TEST_CHECK( !effect );
-
- BaseHandle handle = ScrollViewDepthEffect::New();
-
- DALI_TEST_CHECK( handle );
-
- effect = ScrollViewDepthEffect::DownCast(handle);
-
- DALI_TEST_CHECK( effect );
- END_TEST;
-}
-
-
-int UtcDaliScrollViewPageCubeEffectTest(void)
-{
- ToolkitTestApplication application;
- tet_infoline(" UtcDaliScrollViewPageCubeEffectTest");
-
- Vector2 size = Stage::GetCurrent().GetSize();
-
- ScrollView scrollView = SetupTestScrollView(1, 3, size);
- Actor testPage = gPages[1];
- Wait(application, 500);
-
- ScrollViewPageCubeEffect effect = ScrollViewPageCubeEffect::New();
- scrollView.ApplyEffect(effect);
-
- for(ActorIter pageIter = gPages.begin(); pageIter != gPages.end(); ++pageIter)
- {
- Actor page = *pageIter;
- page.RemoveConstraints();
- page.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
- effect.ApplyToPage(page, Vector2(Math::PI_2, 0.0f));
- }
- Wait(application);
-
- scrollView.ScrollTo(1);
- while(!gOnScrollCompleteCalled)
- {
- Wait(application);
- }
- // test that the first page has reached centre of screen
- Vector3 pagePos = testPage.GetCurrentPosition();
- DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION);
- CleanupTest();
- END_TEST;
-}
-
-int UtcDaliScrollViewPageCarouselEffectTest(void)
-{
- ToolkitTestApplication application;
- tet_infoline(" UtcDaliScrollViewPageCarouselEffectTest");
-
- Vector2 size = Stage::GetCurrent().GetSize();
-
- ScrollView scrollView = SetupTestScrollView(1, 3, size);
- Actor testPage = gPages[1];
- Wait(application, 500);
-
- ScrollViewPageCarouselEffect effect = ScrollViewPageCarouselEffect::New();
- scrollView.ApplyEffect(effect);
-
- for(ActorIter pageIter = gPages.begin(); pageIter != gPages.end(); ++pageIter)
- {
- Actor page = *pageIter;
- page.RemoveConstraints();
- page.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
- effect.ApplyToPage(page);
- }
- Wait(application);
-
- scrollView.ScrollTo(1, 0.5f, DirectionBiasNone);
- while(!gOnScrollCompleteCalled)
- {
- Wait(application);
- }
- // test that the first page has reached centre of screen
- Vector3 pagePos = testPage.GetCurrentPosition();
- DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION);
- CleanupTest();
- END_TEST;
-}
-
-int UtcDaliScrollViewCarouselEffectTest(void)
-{
- ToolkitTestApplication application;
- tet_infoline(" UtcDaliScrollViewCarouselEffectTest");
-
- Vector2 size = Stage::GetCurrent().GetSize();
-
- ScrollView scrollView = SetupTestScrollView(1, 3, size);
- Actor testPage = gPages[1];
- Wait(application, 500);
-
- ScrollViewCarouselEffect effect = ScrollViewCarouselEffect::New();
- scrollView.ApplyEffect(effect);
-
- Actor actor = AddActorToPage(testPage, 0.5f, 0.5f, 3, 3);
- Wait(application);
- Vector3 actorPrePosition = actor.GetCurrentPosition();
-
- effect.ApplyToActor( actor, Vector2(1.2f, 1.2f) );
-
- scrollView.ScrollTo(Vector3(size.x, 0.0f, 0.0f), 0.5f, DirectionBiasNone, DirectionBiasNone);
- while(!gOnScrollCompleteCalled)
- {
- Wait(application);
- }
- // test that the first page has reached centre of screen
- Vector3 actorPostPosition = actor.GetCurrentPosition();
- // just check the actor has moved
- DALI_TEST_CHECK((actorPostPosition - actorPrePosition).Length() > Math::MACHINE_EPSILON_1);
- CleanupTest();
- END_TEST;
-}
-
-int UtcDaliScrollViewDepthEffectTest(void)
-{
- ToolkitTestApplication application;
- tet_infoline(" UtcDaliScrollViewDepthEffectTest");
-
- Vector2 size = Stage::GetCurrent().GetSize();
-
- ScrollView scrollView = SetupTestScrollView(1, 3, size);
- Actor testPage = gPages[1];
- Wait(application, 500);
-
- ScrollViewDepthEffect effect = ScrollViewDepthEffect::New();
- scrollView.ApplyEffect(effect);
-
- Actor actor = AddActorToPage(testPage, 0.5f, 0.5f, 3, 3);
- Wait(application);
- Vector3 actorPrePosition = actor.GetCurrentPosition();
-
- const Vector2 positionExtent(0.5f, 2.5f);
- const Vector2 offsetExtent(1.0f, 1.0f);
- const float positionScale(1.5f);
- const float scaleExtent(0.5f);
-
- effect.ApplyToActor( actor, positionExtent, offsetExtent, positionScale, scaleExtent );
-
- scrollView.ScrollTo(1);
- while(!gOnScrollCompleteCalled)
- {
- Wait(application);
- }
- // test that the first page has reached centre of screen
- Vector3 actorPostPosition = actor.GetCurrentPosition();
- // just check the actor has moved
- DALI_TEST_CHECK((actorPostPosition - actorPrePosition).Length() > Math::MACHINE_EPSILON_1);
- CleanupTest();
- END_TEST;
-}
+++ /dev/null
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <iostream>
-#include <stdlib.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
-#include <dali/integration-api/events/key-event-integ.h>
-
-using namespace Dali;
-using namespace Toolkit;
-
-
-int UtcDaliTextInputSetActiveStyle(void)
-{
- ToolkitTestApplication application;
-
- tet_infoline("Testing Setting of Style to newly added text");
-
- TextInput textInput = TextInput::New(); // create empty TextInput
-
- Stage::GetCurrent().Add(textInput);
-
- const std::string styledString = "Test String<i>ab</i>" ;
- const std::string plainString = "Test String";
- textInput.SetInitialText( plainString );
-
- application.SendNotification();
- application.Render();
-
- textInput.SetEditable(true);
-
- std::string retreivedMarkupString = textInput.GetMarkupText();
-
- tet_infoline("Confirm markup text is a plain string ");
- DALI_TEST_EQUALS( plainString,textInput.GetText(), TEST_LOCATION);
-
- TextStyle style;
- style.SetItalics( true );
-
- tet_infoline("Apply style to TextInput");
- textInput.SetActiveStyle( style );
-
- Integration::KeyEvent eventA("a", "a", 0, 0, 0, Integration::KeyEvent::Down );
- Integration::KeyEvent eventB("b", "b", 0, 0, 0, Integration::KeyEvent::Down );
-
- application.SendNotification();
- application.Render();
-
- application.ProcessEvent(eventA);
- application.SendNotification();
- application.Render();
-
- application.ProcessEvent(eventB);
- application.SendNotification();
- application.Render();
-
- retreivedMarkupString = textInput.GetMarkupText();
-
- DALI_TEST_EQUALS( styledString, retreivedMarkupString, TEST_LOCATION);
- END_TEST;
-}
-
-int UtcDaliTextInputApplyStyleToSelectedText(void)
-{
- ToolkitTestApplication application;
-
- tet_infoline("Testing application of style to selected text ");
-
- TextInput textInput = TextInput::New(); // create empty TextInput
-
- Stage::GetCurrent().Add(textInput);
-
- const std::string styledString = "Test <i>String</i> to style";
- const std::string plainString = "Test String to style";
- textInput.SetInitialText( plainString );
-
- application.SendNotification();
- application.Render();
-
- textInput.SetEditable(true);
-
- std::string retreivedMarkupString = textInput.GetMarkupText();
-
- tet_infoline("Confirm markup text is a plain string ");
- DALI_TEST_EQUALS( plainString,textInput.GetText(), TEST_LOCATION);
-
- TextStyle style;
- style.SetItalics( true );
-
- textInput.SelectText( 5, 11 );
-
- tet_infoline("Apply style to selected text");
- textInput.ApplyStyle( style );
-
- application.Render();
-
- retreivedMarkupString = textInput.GetMarkupText();
-
- DALI_TEST_EQUALS( styledString, retreivedMarkupString, TEST_LOCATION);
- END_TEST;
-}
-
-int UtcDaliTextInputApplyStyleToAll(void)
-{
- ToolkitTestApplication application;
-
- tet_infoline("Testing application of style to all text ");
-
- TextInput textInput = TextInput::New(); // create empty TextInput
-
- Stage::GetCurrent().Add(textInput);
-
- const std::string styledString = "<i>Test String to style</i>";
- const std::string plainString = "Test String to style";
- textInput.SetInitialText( plainString );
-
- application.SendNotification();
- application.Render();
-
- textInput.SetEditable(true);
-
- std::string retreivedMarkupString = textInput.GetMarkupText();
-
- tet_infoline("Confirm markup text is a plain string ");
- DALI_TEST_EQUALS( plainString,textInput.GetText(), TEST_LOCATION);
-
- TextStyle style;
- style.SetItalics( true );
-
- tet_infoline("Apply style to all text");
- textInput.ApplyStyleToAll( style );
-
- application.Render();
-
- retreivedMarkupString = textInput.GetMarkupText();
-
- DALI_TEST_EQUALS( styledString, retreivedMarkupString, TEST_LOCATION);
- END_TEST;
-}
-
-int UtcDaliTextInputGetStyleAtCursor(void)
-{
- ToolkitTestApplication application;
-
- tet_infoline("Test getting style at cursor");
-
- TextInput textInput = TextInput::New(); // create empty TextInput
-
- Stage::GetCurrent().Add(textInput);
-
- const std::string styledString = "Test Stringa<i>b</i>" ;
- const std::string plainString = "Test String";
- textInput.SetInitialText( plainString );
-
- application.SendNotification();
- application.Render();
-
- textInput.SetEditable(true);
-
- tet_infoline("Confirm style at cursor is default(plain)");
- TextStyle style;
- Integration::KeyEvent eventA("a", "a", 0, 0, 0, Integration::KeyEvent::Down );
- application.ProcessEvent(eventA);
- application.SendNotification();
- application.Render();
-
- TextStyle retreivedStyleAtCursor = textInput.GetStyleAtCursor();
-
- DALI_TEST_CHECK( style == retreivedStyleAtCursor );
- DALI_TEST_CHECK( !retreivedStyleAtCursor.IsItalicsEnabled() );
-
- tet_infoline("Set style before adding new character");
- style.SetItalics( true );
- textInput.SetActiveStyle( style );
-
- Integration::KeyEvent eventB("b", "b", 0, 0, 0, Integration::KeyEvent::Down );
- application.ProcessEvent(eventB);
- application.SendNotification();
- application.Render();
-
- tet_infoline("Confirm style at cursor is correct style");
- retreivedStyleAtCursor = textInput.GetStyleAtCursor();
-
- DALI_TEST_CHECK( retreivedStyleAtCursor.IsItalicsEnabled() );
-
- tet_infoline("Confirm style at cursor is not a style that was not set");
- DALI_TEST_CHECK( !retreivedStyleAtCursor.IsUnderlineEnabled() );
-
- tet_infoline("Confirm markup text is correct");
- DALI_TEST_EQUALS( styledString, textInput.GetMarkupText(), TEST_LOCATION);
-
-
-
- END_TEST;
-}
-
-int UtcDaliTextInputSetAndGetTextAlignment(void)
-{
- ToolkitTestApplication application;
-
- TextInput textInput = TextInput::New();
- textInput.SetTextAlignment(static_cast<Alignment::Type>( Alignment::HorizontalCenter) );
-
- bool result = ( textInput.GetTextAlignment() & Alignment::HorizontalCenter ) ;
-
- DALI_TEST_CHECK( result );
-
- result = ( textInput.GetTextAlignment() & Alignment::HorizontalRight );
-
- DALI_TEST_CHECK( !result );
- END_TEST;
-}
-
-int UtcDaliTextInputSetAndGetMultilinePolicy(void)
-{
- ToolkitTestApplication application;
-
- const TextView::MultilinePolicy MULTILINE_POLICIES[] = { TextView::SplitByNewLineChar, TextView::SplitByWord, TextView::SplitByChar };
- const unsigned int NUM_MULTILINE_POLICIES = sizeof( MULTILINE_POLICIES ) / sizeof( unsigned int );
-
- TextInput textInput = TextInput::New();
- Stage::GetCurrent().Add(textInput);
- textInput.SetInitialText( "Hello world!" );
-
- for( unsigned int epIndex = 0; epIndex < NUM_MULTILINE_POLICIES; ++epIndex )
- {
- textInput.SetMultilinePolicy( MULTILINE_POLICIES[epIndex] );
-
- DALI_TEST_EQUALS( textInput.GetMultilinePolicy(), MULTILINE_POLICIES[epIndex], TEST_LOCATION );
- }
- END_TEST;
-}
-
-int UtcDaliTextInputSetAndGetExceedEnabled(void)
-{
- ToolkitTestApplication application;
-
- const TextView::ExceedPolicy EXCEED_POLICIES[] = { TextView::Original, TextView::Fade, TextView::Split, TextView::ShrinkToFit };
- const unsigned int NUM_EXCEED_POLICIES = sizeof( EXCEED_POLICIES ) / sizeof( unsigned int );
-
- TextInput textInput = TextInput::New();
- Stage::GetCurrent().Add(textInput);
- textInput.SetInitialText( "Hello world!" );
-
- for( unsigned int epIndex = 0; epIndex < NUM_EXCEED_POLICIES; ++epIndex )
- {
- textInput.SetWidthExceedPolicy( EXCEED_POLICIES[epIndex] );
-
- DALI_TEST_EQUALS( textInput.GetWidthExceedPolicy(), EXCEED_POLICIES[epIndex], TEST_LOCATION );
- }
- END_TEST;
-}
# List of test case sources (Only these get parsed for test cases)
SET(TC_SOURCES
utc-Dali-Alignment.cpp
+ utc-Dali-BendyEffect.cpp
+ utc-Dali-BlindEffect.cpp
+ utc-Dali-BloomView.cpp
utc-Dali-BubbleEmitter.cpp
+ utc-Dali-Builder.cpp
+ utc-Dali-CarouselEffect.cpp
+ utc-Dali-CheckBoxButton.cpp
+ utc-Dali-Cluster.cpp
+ utc-Dali-CubeTransitionEffect.cpp
+ utc-Dali-DepthLayout.cpp
+ utc-Dali-DisplacementEffect.cpp
+ utc-Dali-DistanceFieldEffect.cpp
+ utc-Dali-GaussianBlurView.cpp
+ utc-Dali-JsonParser.cpp
+ utc-Dali-KeyInputFocusManager.cpp
+ utc-Dali-NavigationControl.cpp
+ utc-Dali-NavigationLayout.cpp
+ utc-Dali-OverlayEffect.cpp
+ utc-Dali-Page.cpp
+ utc-Dali-PageTurnEffect.cpp
+ utc-Dali-PageTurnView.cpp
+ utc-Dali-RollLayout.cpp
+ utc-Dali-ScrollView.cpp
+ utc-Dali-ShadowView.cpp
+ utc-Dali-ShearEffect.cpp
+ utc-Dali-Slider.cpp
+ utc-Dali-SoftButtonEffect.cpp
+ utc-Dali-SpiralLayout.cpp
+ utc-Dali-SpotEffect.cpp
+ utc-Dali-SquareDissolveEffect.cpp
+ utc-Dali-TableView.cpp
+ utc-Dali-ToolBar.cpp
+ utc-Dali-View.cpp
+ utc-Dali-WaterEffect.cpp
utc-Dali-Button.cpp
utc-Dali-Control.cpp
utc-Dali-ControlImpl.cpp
utc-Dali-NinePatchMaskEffect.cpp
utc-Dali-Popup.cpp
utc-Dali-PushButton.cpp
+ utc-Dali-RadioButton.cpp
utc-Dali-Ripple2DEffect.cpp
utc-Dali-RippleEffect.cpp
utc-Dali-ScrollViewEffect.cpp
+ utc-Dali-StyleManager.cpp
utc-Dali-SuperBlurView.cpp
utc-Dali-SwirlEffect.cpp
utc-Dali-TextInput.cpp
}
END_TEST;
}
+
+int UtcDaliControlImplTypeRegistry(void)
+{
+ ToolkitTestApplication application;
+
+ // Register Type
+ TypeInfo type;
+ type = TypeRegistry::Get().GetTypeInfo( "Control" );
+ DALI_TEST_CHECK( type );
+ BaseHandle handle = type.CreateInstance();
+ DALI_TEST_CHECK( handle );
+
+ // Check if it's a control
+ DALI_TEST_CHECK( Control::DownCast(handle) );
+ END_TEST;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+namespace
+{
+static bool MouseWheelEventCallback(Actor actor, const MouseWheelEvent& event)
+{
+ return false;
+}
+}
+
+int UtcDaliControlImplMouseWheelEvent(void)
+{
+ ToolkitTestApplication application;
+
+ {
+ DummyControl dummy = DummyControl::New( true );
+ DummyControlImplOverride& dummyImpl = static_cast<DummyControlImplOverride&>(dummy.GetImplementation());
+
+ dummy.SetSize(100.0f, 100.0f);
+ dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ Stage::GetCurrent().Add(dummy);
+
+ dummy.MouseWheelEventSignal().Connect(&MouseWheelEventCallback);
+
+ application.Render();
+ application.SendNotification();
+ application.Render();
+ application.SendNotification();
+
+ DALI_TEST_EQUALS( dummyImpl.mouseWheelEventCalled, false, TEST_LOCATION );
+
+ // simulate a mouse wheel event
+ Vector2 screenCoordinates( 10.0f, 10.0f );
+ Integration::MouseWheelEvent event(0, 0u, screenCoordinates, 1, 1000u);
+ application.ProcessEvent(event);
+ DALI_TEST_EQUALS( dummyImpl.mouseWheelEventCalled, true, TEST_LOCATION );
+
+ Stage::GetCurrent().Remove(dummy);
+ }
+
+ // Ensure full code coverage
+ {
+ DummyControl dummy = DummyControl::New();
+
+ dummy.SetSize(100.0f, 100.0f);
+ dummy.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ Stage::GetCurrent().Add(dummy);
+
+ dummy.MouseWheelEventSignal().Connect(&MouseWheelEventCallback);
+
+ application.Render();
+ application.SendNotification();
+ application.Render();
+ application.SendNotification();
+
+ // simulate a mouse wheel event
+ Vector2 screenCoordinates( 20.0f, 20.0f );
+ Integration::MouseWheelEvent event(0, 0u, screenCoordinates, 1, 1000u);
+ application.ProcessEvent(event);
+
+ Stage::GetCurrent().Remove(dummy);
+ }
+ END_TEST;
+}
DALI_TEST_CHECK( button1 );
END_TEST;
}
+
+int UtcDaliDefaultControlsCreateCheckBoxButton(void)
+{
+ ToolkitTestApplication application;
+
+ tet_infoline(" UtcDaliDefaultControlsCreateCheckBoxButton");
+
+ const std::string imagePath( "Facke image path" );
+ const std::string voidImagePath( "" );
+
+ ImageActor image = CreateSolidColorActor( Color::RED );
+ ImageActor voidImage;
+
+ CheckBoxButton button0, button1, button2, button3, button4, button5;
+
+ try
+ {
+ button0 = CreateCheckBoxButton( voidImagePath, voidImagePath, voidImagePath, voidImagePath );
+ button1 = CreateCheckBoxButton( imagePath, voidImagePath, voidImagePath, voidImagePath );
+ button2 = CreateCheckBoxButton( voidImagePath, imagePath, voidImagePath, voidImagePath );
+ button3 = CreateCheckBoxButton( voidImagePath, voidImagePath, imagePath, voidImagePath );
+ button4 = CreateCheckBoxButton( voidImagePath, voidImagePath, voidImagePath, imagePath );
+ button5 = CreateCheckBoxButton( imagePath, imagePath, imagePath, imagePath );
+ }
+ catch( ... )
+ {
+ tet_result( TET_FAIL );
+ }
+
+ DALI_TEST_CHECK( button0 );
+ DALI_TEST_CHECK( button1 );
+ DALI_TEST_CHECK( button2 );
+ DALI_TEST_CHECK( button3 );
+ DALI_TEST_CHECK( button4 );
+ DALI_TEST_CHECK( button5 );
+
+ try
+ {
+ button0 = CreateCheckBoxButton( voidImage, voidImage, voidImage, voidImage );
+ button1 = CreateCheckBoxButton( image, voidImage, voidImage, voidImage );
+ button2 = CreateCheckBoxButton( voidImage, image, voidImage, voidImage );
+ button3 = CreateCheckBoxButton( voidImage, voidImage, image, voidImage );
+ button4 = CreateCheckBoxButton( voidImage, voidImage, voidImage, image );
+ button5 = CreateCheckBoxButton( image, image, image, image );
+ }
+ catch( ... )
+ {
+ tet_result( TET_FAIL );
+ }
+
+ DALI_TEST_CHECK( button0 );
+ DALI_TEST_CHECK( button1 );
+ DALI_TEST_CHECK( button2 );
+ DALI_TEST_CHECK( button3 );
+ DALI_TEST_CHECK( button4 );
+ DALI_TEST_CHECK( button5 );
+
+ try
+ {
+ button0 = CreateCheckBoxButton( voidImagePath, voidImagePath );
+ button1 = CreateCheckBoxButton( voidImagePath, imagePath );
+ button2 = CreateCheckBoxButton( imagePath, voidImagePath );
+ button3 = CreateCheckBoxButton( imagePath, imagePath );
+ }
+ catch( ... )
+ {
+ tet_result( TET_FAIL );
+ }
+
+ DALI_TEST_CHECK( button0 );
+ DALI_TEST_CHECK( button1 );
+ DALI_TEST_CHECK( button2 );
+ DALI_TEST_CHECK( button3 );
+
+ try
+ {
+ button0 = CreateCheckBoxButton( voidImage, voidImage );
+ button2 = CreateCheckBoxButton( voidImage, image );
+ button3 = CreateCheckBoxButton( voidImage, image );
+ button4 = CreateCheckBoxButton( image, image );
+ }
+ catch( ... )
+ {
+ tet_result( TET_FAIL );
+ }
+
+ DALI_TEST_CHECK( button0 );
+ DALI_TEST_CHECK( button1 );
+ DALI_TEST_CHECK( button2 );
+ DALI_TEST_CHECK( button3 );
+ END_TEST;
+}
// As we have added one layout, check the number of layout is now 1
DALI_TEST_CHECK(view.GetLayoutCount() == 1);
+ // Create a depth layout and add it to ItemView
+ DepthLayoutPtr depthLayout = DepthLayout::New();
+ view.AddLayout(*depthLayout);
+
+ // As we have added another layout, check the number of layout is now 2
+ DALI_TEST_CHECK(view.GetLayoutCount() == 2);
+
+ // Create a spiral layout and add it to ItemView
+ SpiralLayoutPtr spiralLayout = SpiralLayout::New();
+ view.AddLayout(*spiralLayout);
+
+ // As we have added another layout, check the number of layout is now 3
+ DALI_TEST_CHECK(view.GetLayoutCount() == 3);
// Check we are getting the correct layout from ItemView
DALI_TEST_CHECK(view.GetLayout(0) == gridLayout);
+ DALI_TEST_CHECK(view.GetLayout(1) == depthLayout);
+ DALI_TEST_CHECK(view.GetLayout(2) == spiralLayout);
END_TEST;
}
// As we have added one layout, check the number of layout is now 1
DALI_TEST_CHECK(view.GetLayoutCount() == 1);
+ // Create a depth layout and add it to ItemView
+ DepthLayoutPtr depthLayout = DepthLayout::New();
+ view.AddLayout(*depthLayout);
+
+ // As we have added another layout, check the number of layout is now 2
+ DALI_TEST_CHECK(view.GetLayoutCount() == 2);
+
// Check we are getting the correct layout from ItemView
DALI_TEST_CHECK(view.GetLayout(0) == gridLayout);
+ DALI_TEST_CHECK(view.GetLayout(1) == depthLayout);
// Remove the grid layout
view.RemoveLayout(0);
- // As we have removed the grid layout, check the number of layout is now 0
- DALI_TEST_CHECK(view.GetLayoutCount() == 0);
+ // As we have removed the grid layout, check the number of layout is now 1
+ DALI_TEST_CHECK(view.GetLayoutCount() == 1);
+
+ // Check we are getting the correct layout from ItemView
+ DALI_TEST_CHECK(view.GetLayout(0) == depthLayout);
+
+ // Remove the depth layout
+ view.RemoveLayout(0);
+ // As we also removed the depth layout, check the number of layout is now 0
+ DALI_TEST_CHECK(view.GetLayoutCount() == 0);
END_TEST;
}
GridLayoutPtr gridLayout = GridLayout::New();
view.AddLayout(*gridLayout);
- DALI_TEST_CHECK(view.GetLayoutCount() == 1);
+ // Create a depth layout and add it to ItemView
+ DepthLayoutPtr depthLayout = DepthLayout::New();
+ view.AddLayout(*depthLayout);
+
+ // Create a spiral layout and add it to ItemView
+ SpiralLayoutPtr spiralLayout = SpiralLayout::New();
+ view.AddLayout(*spiralLayout);
+
+ // As we have added three layouts, check the number of layout is now 3
+ DALI_TEST_CHECK(view.GetLayoutCount() == 3);
// Check there is no active layout at the moment
DALI_TEST_CHECK(view.GetActiveLayout() == NULL);
- // Activate the grid layout
+ // Activate the depth layout
Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+ view.ActivateLayout(1, stageSize, 0.5f);
+
+ // Check the current active layout is the depth layout
+ DALI_TEST_CHECK(view.GetActiveLayout() == depthLayout);
+
+ // Activate the grid layout
view.ActivateLayout(0, stageSize, 0.5f);
// Check the current active layout is the grid layout
DALI_TEST_CHECK(view.GetActiveLayout() == gridLayout);
+ // Activate the spiral layout
+ view.ActivateLayout(2, stageSize, 0.5f);
+
+ // Check the current active layout is the spiral layout
+ DALI_TEST_CHECK(view.GetActiveLayout() == spiralLayout);
END_TEST;
}
tet_infoline(" UtcDaliKeyboardKeyboardFocusManagerGet");
+ // Register Type
+ TypeInfo type;
+ type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
+ DALI_TEST_CHECK( type );
+ BaseHandle handle = type.CreateInstance();
+ DALI_TEST_CHECK( handle );
+
KeyboardFocusManager manager;
manager = KeyboardFocusManager::Get();
tet_infoline(" UtcDaliKeyboardFocusManagerMoveFocus");
+ // Register Type
+ TypeInfo type;
+ type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
+ DALI_TEST_CHECK( type );
+ BaseHandle handle = type.CreateInstance();
+ DALI_TEST_CHECK( handle );
+
KeyboardFocusManager manager = KeyboardFocusManager::Get();
DALI_TEST_CHECK(manager);
preFocusChangeCallback.Reset();
DALI_TEST_CHECK(!focusChangedCallback.mSignalVerified);
+ // Create a 2x2 table view and try to move focus inside it
+ TableView tableView = TableView::New( 2, 2 );
+ Stage::GetCurrent().Add(tableView);
+
+ // Create the third actor
+ Actor third = Actor::New();
+ third.SetKeyboardFocusable(true);
+
+ // Create the fourth actor
+ Actor fourth = Actor::New();
+ fourth.SetKeyboardFocusable(true);
+
+ // Add the four children to table view
+ tableView.AddChild(first, TableView::CellPosition(0, 0));
+ tableView.AddChild(second, TableView::CellPosition(0, 1));
+ tableView.AddChild(third, TableView::CellPosition(1, 0));
+ tableView.AddChild(fourth, TableView::CellPosition(1, 1));
+
+ // Set the focus to the first actor
+ DALI_TEST_CHECK(manager.SetCurrentFocusActor(first) == true);
+ DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
+ DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+ DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == second);
+ DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
+ focusChangedCallback.Reset();
+
+ // Move the focus towards right
+ DALI_TEST_CHECK(manager.MoveFocus(Control::Right) == true);
+ DALI_TEST_CHECK(manager.GetCurrentFocusActor() == second);
+ DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+ DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
+ DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == second);
+ focusChangedCallback.Reset();
+
+ // Move the focus towards down
+ DALI_TEST_CHECK(manager.MoveFocus(Control::Down) == true);
+ DALI_TEST_CHECK(manager.GetCurrentFocusActor() == fourth);
+ DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+ DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == second);
+ DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == fourth);
+ focusChangedCallback.Reset();
+
+ // Move the focus towards left
+ DALI_TEST_CHECK(manager.MoveFocus(Control::Left) == true);
+ DALI_TEST_CHECK(manager.GetCurrentFocusActor() == third);
+ DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+ DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == fourth);
+ DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == third);
+ focusChangedCallback.Reset();
+
+ // Move the focus towards up
+ DALI_TEST_CHECK(manager.MoveFocus(Control::Up) == true);
+ DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
+ DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+ DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == third);
+ DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
+ focusChangedCallback.Reset();
+
+ // Move the focus towards left. The focus move will fail as no way to move it upwards
+ DALI_TEST_CHECK(manager.MoveFocus(Control::Left) == false);
+ DALI_TEST_CHECK(manager.GetCurrentFocusActor() == first);
+ DALI_TEST_CHECK(preFocusChangeCallback.mSignalVerified);
+ DALI_TEST_CHECK(preFocusChangeCallback.mCurrentFocusedActor == first);
+ DALI_TEST_CHECK(preFocusChangeCallback.mProposedActorToFocus == Actor());
+ DALI_TEST_CHECK(preFocusChangeCallback.mDirection == Control::Left);
+ preFocusChangeCallback.Reset();
+ DALI_TEST_CHECK(!focusChangedCallback.mSignalVerified);
+
+ // Enable the loop
+ manager.SetFocusGroupLoop(true);
+ DALI_TEST_CHECK(manager.GetFocusGroupLoop() == true);
+
+ // Move the focus towards left again. The focus should move to the fourth actor.
+ DALI_TEST_CHECK(manager.MoveFocus(Control::Left) == true);
+ DALI_TEST_CHECK(manager.GetCurrentFocusActor() == fourth);
+ DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
+ DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
+ DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == fourth);
+ focusChangedCallback.Reset();
END_TEST;
}
focusedActorActivatedCallback.Reset();
END_TEST;
}
+
+int UtcDaliKeyboardFocusManagerSignalFocusGroupChanged(void)
+{
+ ToolkitTestApplication application;
+
+ tet_infoline(" UtcDaliKeyboardFocusManagerSignalFocusGroupChanged");
+
+ // Register Type
+ TypeInfo type;
+ type = TypeRegistry::Get().GetTypeInfo( "KeyboardFocusManager" );
+ DALI_TEST_CHECK( type );
+ BaseHandle handle = type.CreateInstance();
+ DALI_TEST_CHECK( handle );
+
+ KeyboardFocusManager manager = KeyboardFocusManager::Get();
+ DALI_TEST_CHECK(manager);
+
+ bool focusGroupChangedSignalVerified = false;
+ FocusGroupChangedCallback focusGroupChangedCallback(focusGroupChangedSignalVerified);
+ manager.FocusGroupChangedSignal().Connect( &focusGroupChangedCallback, &FocusGroupChangedCallback::Callback );
+
+ Integration::KeyEvent tabEvent("Tab", "", 0, 0, 0, Integration::KeyEvent::Down);
+ Integration::KeyEvent shiftTabEvent("Tab", "", 0, 1, 0, Integration::KeyEvent::Down);
+
+ // Send the tab event to change focus group in the forward direction
+ application.ProcessEvent(tabEvent);
+ DALI_TEST_CHECK(focusGroupChangedCallback.mSignalVerified);
+ DALI_TEST_CHECK(focusGroupChangedCallback.mCurrentFocusedActor == Actor());
+ DALI_TEST_CHECK(focusGroupChangedCallback.mForward == true);
+ focusGroupChangedCallback.Reset();
+
+ // Send the shift tab event to change focus group in the backward direction
+ application.ProcessEvent(shiftTabEvent);
+ DALI_TEST_CHECK(focusGroupChangedCallback.mSignalVerified);
+ DALI_TEST_CHECK(focusGroupChangedCallback.mCurrentFocusedActor == Actor());
+ DALI_TEST_CHECK(focusGroupChangedCallback.mForward == false);
+ focusGroupChangedCallback.Reset();
+ END_TEST;
+}
END_TEST;
}
+int UtcDaliScrollViewPageCubeEffectSetup(void)
+{
+ tet_infoline(" UtcDaliScrollViewPageCubeEffectSetup");
+
+ ScrollViewPageCubeEffect effect;
+
+ DALI_TEST_CHECK( !effect );
+
+ BaseHandle handle = ScrollViewPageCubeEffect::New();
+
+ DALI_TEST_CHECK( handle );
+
+ effect = ScrollViewPageCubeEffect::DownCast(handle);
+
+ DALI_TEST_CHECK( effect );
+ END_TEST;
+}
+
+
+int UtcDaliScrollViewPageCarouselEffectSetup(void)
+{
+ tet_infoline(" UtcDaliScrollViewCarouselEffectSetup");
+
+ ScrollViewPageCarouselEffect effect;
+
+ DALI_TEST_CHECK( !effect );
+
+ BaseHandle handle = ScrollViewPageCarouselEffect::New();
+
+ DALI_TEST_CHECK( handle );
+
+ effect = ScrollViewPageCarouselEffect::DownCast(handle);
+
+ DALI_TEST_CHECK( effect );
+ END_TEST;
+}
+
+int UtcDaliScrollViewCarouselEffectSetup(void)
+{
+ tet_infoline(" UtcDaliScrollViewCarouselEffectSetup");
+
+ ScrollViewCarouselEffect effect;
+
+ DALI_TEST_CHECK( !effect );
+
+ BaseHandle handle = ScrollViewCarouselEffect::New();
+
+ DALI_TEST_CHECK( handle );
+
+ effect = ScrollViewCarouselEffect::DownCast(handle);
+
+ DALI_TEST_CHECK( effect );
+ END_TEST;
+}
+
+int UtcDaliScrollViewDepthEffectSetup(void)
+{
+ tet_infoline(" UtcDaliScrollViewDepthEffectSetup");
+
+ ScrollViewDepthEffect effect;
+
+ DALI_TEST_CHECK( !effect );
+
+ BaseHandle handle = ScrollViewDepthEffect::New();
+
+ DALI_TEST_CHECK( handle );
+
+ effect = ScrollViewDepthEffect::DownCast(handle);
+
+ DALI_TEST_CHECK( effect );
+ END_TEST;
+}
+
+
+int UtcDaliScrollViewPageCubeEffectTest(void)
+{
+ ToolkitTestApplication application;
+ tet_infoline(" UtcDaliScrollViewPageCubeEffectTest");
+
+ Vector2 size = Stage::GetCurrent().GetSize();
+
+ ScrollView scrollView = SetupTestScrollView(1, 3, size);
+ Actor testPage = gPages[1];
+ Wait(application, 500);
+
+ ScrollViewPageCubeEffect effect = ScrollViewPageCubeEffect::New();
+ scrollView.ApplyEffect(effect);
+
+ for(ActorIter pageIter = gPages.begin(); pageIter != gPages.end(); ++pageIter)
+ {
+ Actor page = *pageIter;
+ page.RemoveConstraints();
+ page.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ effect.ApplyToPage(page, Vector2(Math::PI_2, 0.0f));
+ }
+ Wait(application);
+
+ scrollView.ScrollTo(1);
+ while(!gOnScrollCompleteCalled)
+ {
+ Wait(application);
+ }
+ // test that the first page has reached centre of screen
+ Vector3 pagePos = testPage.GetCurrentPosition();
+ DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+ CleanupTest();
+ END_TEST;
+}
+
+int UtcDaliScrollViewPageCarouselEffectTest(void)
+{
+ ToolkitTestApplication application;
+ tet_infoline(" UtcDaliScrollViewPageCarouselEffectTest");
+
+ Vector2 size = Stage::GetCurrent().GetSize();
+
+ ScrollView scrollView = SetupTestScrollView(1, 3, size);
+ Actor testPage = gPages[1];
+ Wait(application, 500);
+
+ ScrollViewPageCarouselEffect effect = ScrollViewPageCarouselEffect::New();
+ scrollView.ApplyEffect(effect);
+
+ for(ActorIter pageIter = gPages.begin(); pageIter != gPages.end(); ++pageIter)
+ {
+ Actor page = *pageIter;
+ page.RemoveConstraints();
+ page.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ effect.ApplyToPage(page);
+ }
+ Wait(application);
+
+ scrollView.ScrollTo(1, 0.5f, DirectionBiasNone);
+ while(!gOnScrollCompleteCalled)
+ {
+ Wait(application);
+ }
+ // test that the first page has reached centre of screen
+ Vector3 pagePos = testPage.GetCurrentPosition();
+ DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+ CleanupTest();
+ END_TEST;
+}
+
+int UtcDaliScrollViewCarouselEffectTest(void)
+{
+ ToolkitTestApplication application;
+ tet_infoline(" UtcDaliScrollViewCarouselEffectTest");
+
+ Vector2 size = Stage::GetCurrent().GetSize();
+
+ ScrollView scrollView = SetupTestScrollView(1, 3, size);
+ Actor testPage = gPages[1];
+ Wait(application, 500);
+
+ ScrollViewCarouselEffect effect = ScrollViewCarouselEffect::New();
+ scrollView.ApplyEffect(effect);
+
+ Actor actor = AddActorToPage(testPage, 0.5f, 0.5f, 3, 3);
+ Wait(application);
+ Vector3 actorPrePosition = actor.GetCurrentPosition();
+
+ effect.ApplyToActor( actor, Vector2(1.2f, 1.2f) );
+
+ scrollView.ScrollTo(Vector3(size.x, 0.0f, 0.0f), 0.5f, DirectionBiasNone, DirectionBiasNone);
+ while(!gOnScrollCompleteCalled)
+ {
+ Wait(application);
+ }
+ // test that the first page has reached centre of screen
+ Vector3 actorPostPosition = actor.GetCurrentPosition();
+ // just check the actor has moved
+ DALI_TEST_CHECK((actorPostPosition - actorPrePosition).Length() > Math::MACHINE_EPSILON_1);
+ CleanupTest();
+ END_TEST;
+}
+
+int UtcDaliScrollViewDepthEffectTest(void)
+{
+ ToolkitTestApplication application;
+ tet_infoline(" UtcDaliScrollViewDepthEffectTest");
+
+ Vector2 size = Stage::GetCurrent().GetSize();
+
+ ScrollView scrollView = SetupTestScrollView(1, 3, size);
+ Actor testPage = gPages[1];
+ Wait(application, 500);
+
+ ScrollViewDepthEffect effect = ScrollViewDepthEffect::New();
+ scrollView.ApplyEffect(effect);
+
+ Actor actor = AddActorToPage(testPage, 0.5f, 0.5f, 3, 3);
+ Wait(application);
+ Vector3 actorPrePosition = actor.GetCurrentPosition();
+
+ const Vector2 positionExtent(0.5f, 2.5f);
+ const Vector2 offsetExtent(1.0f, 1.0f);
+ const float positionScale(1.5f);
+ const float scaleExtent(0.5f);
+
+ effect.ApplyToActor( actor, positionExtent, offsetExtent, positionScale, scaleExtent );
+
+ scrollView.ScrollTo(1);
+ while(!gOnScrollCompleteCalled)
+ {
+ Wait(application);
+ }
+ // test that the first page has reached centre of screen
+ Vector3 actorPostPosition = actor.GetCurrentPosition();
+ // just check the actor has moved
+ DALI_TEST_CHECK((actorPostPosition - actorPrePosition).Length() > Math::MACHINE_EPSILON_1);
+ CleanupTest();
+ END_TEST;
+}
}
-int UtcDaliTextInputSetAndGetTextAlignment(void)
+int UtcDaliTextInputSetAndGetTextAlignment01(void)
{
ToolkitTestApplication application;
END_TEST;
}
+int UtcDaliTextInputSetAndGetTextAlignment02(void)
+{
+ ToolkitTestApplication application;
+
+ TextInput textInput = TextInput::New();
+ textInput.SetTextAlignment(static_cast<Alignment::Type>( Alignment::HorizontalCenter) );
+
+ bool result = ( textInput.GetTextAlignment() & Alignment::HorizontalCenter ) ;
+
+ DALI_TEST_CHECK( result );
+
+ result = ( textInput.GetTextAlignment() & Alignment::HorizontalRight );
+
+ DALI_TEST_CHECK( !result );
+ END_TEST;
+}
int UtcDaliTextInputSetSortModifier(void)
{
DALI_TEST_EQUALS( scrollPosition, Vector2( 149.153656f, 0.f ), Math::MACHINE_EPSILON_1000, TEST_LOCATION );
END_TEST;
}
+
+int UtcDaliTextInputSetActiveStyle(void)
+{
+ ToolkitTestApplication application;
+
+ tet_infoline("Testing Setting of Style to newly added text");
+
+ TextInput textInput = TextInput::New(); // create empty TextInput
+
+ Stage::GetCurrent().Add(textInput);
+
+ const std::string styledString = "Test String<i>ab</i>" ;
+ const std::string plainString = "Test String";
+ textInput.SetInitialText( plainString );
+
+ application.SendNotification();
+ application.Render();
+
+ textInput.SetEditable(true);
+
+ std::string retreivedMarkupString = textInput.GetMarkupText();
+
+ tet_infoline("Confirm markup text is a plain string ");
+ DALI_TEST_EQUALS( plainString,textInput.GetText(), TEST_LOCATION);
+
+ TextStyle style;
+ style.SetItalics( true );
+
+ tet_infoline("Apply style to TextInput");
+ textInput.SetActiveStyle( style );
+
+ Integration::KeyEvent eventA("a", "a", 0, 0, 0, Integration::KeyEvent::Down );
+ Integration::KeyEvent eventB("b", "b", 0, 0, 0, Integration::KeyEvent::Down );
+
+ application.SendNotification();
+ application.Render();
+
+ application.ProcessEvent(eventA);
+ application.SendNotification();
+ application.Render();
+
+ application.ProcessEvent(eventB);
+ application.SendNotification();
+ application.Render();
+
+ retreivedMarkupString = textInput.GetMarkupText();
+
+ DALI_TEST_EQUALS( styledString, retreivedMarkupString, TEST_LOCATION);
+ END_TEST;
+}
+
+int UtcDaliTextInputApplyStyleToSelectedText(void)
+{
+ ToolkitTestApplication application;
+
+ tet_infoline("Testing application of style to selected text ");
+
+ TextInput textInput = TextInput::New(); // create empty TextInput
+
+ Stage::GetCurrent().Add(textInput);
+
+ const std::string styledString = "Test <i>String</i> to style";
+ const std::string plainString = "Test String to style";
+ textInput.SetInitialText( plainString );
+
+ application.SendNotification();
+ application.Render();
+
+ textInput.SetEditable(true);
+
+ std::string retreivedMarkupString = textInput.GetMarkupText();
+
+ tet_infoline("Confirm markup text is a plain string ");
+ DALI_TEST_EQUALS( plainString,textInput.GetText(), TEST_LOCATION);
+
+ TextStyle style;
+ style.SetItalics( true );
+
+ textInput.SelectText( 5, 11 );
+
+ tet_infoline("Apply style to selected text");
+ textInput.ApplyStyle( style );
+
+ application.Render();
+
+ retreivedMarkupString = textInput.GetMarkupText();
+
+ DALI_TEST_EQUALS( styledString, retreivedMarkupString, TEST_LOCATION);
+ END_TEST;
+}
+
+int UtcDaliTextInputApplyStyleToAll(void)
+{
+ ToolkitTestApplication application;
+
+ tet_infoline("Testing application of style to all text ");
+
+ TextInput textInput = TextInput::New(); // create empty TextInput
+
+ Stage::GetCurrent().Add(textInput);
+
+ const std::string styledString = "<i>Test String to style</i>";
+ const std::string plainString = "Test String to style";
+ textInput.SetInitialText( plainString );
+
+ application.SendNotification();
+ application.Render();
+
+ textInput.SetEditable(true);
+
+ std::string retreivedMarkupString = textInput.GetMarkupText();
+
+ tet_infoline("Confirm markup text is a plain string ");
+ DALI_TEST_EQUALS( plainString,textInput.GetText(), TEST_LOCATION);
+
+ TextStyle style;
+ style.SetItalics( true );
+
+ tet_infoline("Apply style to all text");
+ textInput.ApplyStyleToAll( style );
+
+ application.Render();
+
+ retreivedMarkupString = textInput.GetMarkupText();
+
+ DALI_TEST_EQUALS( styledString, retreivedMarkupString, TEST_LOCATION);
+ END_TEST;
+}
+
+int UtcDaliTextInputGetStyleAtCursor(void)
+{
+ ToolkitTestApplication application;
+
+ tet_infoline("Test getting style at cursor");
+
+ TextInput textInput = TextInput::New(); // create empty TextInput
+
+ Stage::GetCurrent().Add(textInput);
+
+ const std::string styledString = "Test Stringa<i>b</i>" ;
+ const std::string plainString = "Test String";
+ textInput.SetInitialText( plainString );
+
+ application.SendNotification();
+ application.Render();
+
+ textInput.SetEditable(true);
+
+ tet_infoline("Confirm style at cursor is default(plain)");
+ TextStyle style;
+ Integration::KeyEvent eventA("a", "a", 0, 0, 0, Integration::KeyEvent::Down );
+ application.ProcessEvent(eventA);
+ application.SendNotification();
+ application.Render();
+
+ TextStyle retreivedStyleAtCursor = textInput.GetStyleAtCursor();
+
+ DALI_TEST_CHECK( style == retreivedStyleAtCursor );
+ DALI_TEST_CHECK( !retreivedStyleAtCursor.IsItalicsEnabled() );
+
+ tet_infoline("Set style before adding new character");
+ style.SetItalics( true );
+ textInput.SetActiveStyle( style );
+
+ Integration::KeyEvent eventB("b", "b", 0, 0, 0, Integration::KeyEvent::Down );
+ application.ProcessEvent(eventB);
+ application.SendNotification();
+ application.Render();
+
+ tet_infoline("Confirm style at cursor is correct style");
+ retreivedStyleAtCursor = textInput.GetStyleAtCursor();
+
+ DALI_TEST_CHECK( retreivedStyleAtCursor.IsItalicsEnabled() );
+
+ tet_infoline("Confirm style at cursor is not a style that was not set");
+ DALI_TEST_CHECK( !retreivedStyleAtCursor.IsUnderlineEnabled() );
+
+ tet_infoline("Confirm markup text is correct");
+ DALI_TEST_EQUALS( styledString, textInput.GetMarkupText(), TEST_LOCATION);
+
+
+
+ END_TEST;
+}
+
+int UtcDaliTextInputSetAndGetMultilinePolicy(void)
+{
+ ToolkitTestApplication application;
+
+ const TextView::MultilinePolicy MULTILINE_POLICIES[] = { TextView::SplitByNewLineChar, TextView::SplitByWord, TextView::SplitByChar };
+ const unsigned int NUM_MULTILINE_POLICIES = sizeof( MULTILINE_POLICIES ) / sizeof( unsigned int );
+
+ TextInput textInput = TextInput::New();
+ Stage::GetCurrent().Add(textInput);
+ textInput.SetInitialText( "Hello world!" );
+
+ for( unsigned int epIndex = 0; epIndex < NUM_MULTILINE_POLICIES; ++epIndex )
+ {
+ textInput.SetMultilinePolicy( MULTILINE_POLICIES[epIndex] );
+
+ DALI_TEST_EQUALS( textInput.GetMultilinePolicy(), MULTILINE_POLICIES[epIndex], TEST_LOCATION );
+ }
+ END_TEST;
+}
+
+int UtcDaliTextInputSetAndGetExceedEnabled(void)
+{
+ ToolkitTestApplication application;
+
+ const TextView::ExceedPolicy EXCEED_POLICIES[] = { TextView::Original, TextView::Fade, TextView::Split, TextView::ShrinkToFit };
+ const unsigned int NUM_EXCEED_POLICIES = sizeof( EXCEED_POLICIES ) / sizeof( unsigned int );
+
+ TextInput textInput = TextInput::New();
+ Stage::GetCurrent().Add(textInput);
+ textInput.SetInitialText( "Hello world!" );
+
+ for( unsigned int epIndex = 0; epIndex < NUM_EXCEED_POLICIES; ++epIndex )
+ {
+ textInput.SetWidthExceedPolicy( EXCEED_POLICIES[epIndex] );
+
+ DALI_TEST_EQUALS( textInput.GetWidthExceedPolicy(), EXCEED_POLICIES[epIndex], TEST_LOCATION );
+ }
+ END_TEST;
+}
+++ /dev/null
-# Files to install here
-
-dali_toolkit_base_image_files =\
- $(toolkit_base_images_dir)/*.png
+++ /dev/null
-# Add local source files here
-
-toolkit_base_src_files = \
- $(toolkit_base_src_dir)/controls/relayout-controller.cpp \
- $(toolkit_base_src_dir)/controls/relayout-controller-impl.cpp \
- $(toolkit_base_src_dir)/controls/relayout-helper.cpp \
- $(toolkit_base_src_dir)/controls/alignment/alignment-impl.cpp \
- $(toolkit_base_src_dir)/controls/buttons/button-impl.cpp \
- $(toolkit_base_src_dir)/controls/buttons/check-box-button-default-painter-impl.cpp \
- $(toolkit_base_src_dir)/controls/buttons/check-box-button-impl.cpp \
- $(toolkit_base_src_dir)/controls/buttons/push-button-default-painter-impl.cpp \
- $(toolkit_base_src_dir)/controls/buttons/push-button-impl.cpp \
- $(toolkit_base_src_dir)/controls/buttons/radio-button-impl.cpp \
- $(toolkit_base_src_dir)/controls/popup/popup-impl.cpp \
- $(toolkit_base_src_dir)/controls/popup/popup-style-impl.cpp \
- $(toolkit_base_src_dir)/controls/scroll-bar/scroll-bar-impl.cpp \
- $(toolkit_base_src_dir)/controls/scroll-component/scroll-bar-internal-impl.cpp \
- $(toolkit_base_src_dir)/controls/scroll-component/scroll-bar-internal.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/item-view/item-view-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/bouncing-effect-actor.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scrollable-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-connector-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-base-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/table-view/table-view-impl.cpp \
- $(toolkit_base_src_dir)/controls/text-input/text-input-decorator-impl.cpp \
- $(toolkit_base_src_dir)/controls/text-input/text-input-handles-impl.cpp \
- $(toolkit_base_src_dir)/controls/text-input/text-input-text-highlight-impl.cpp \
- $(toolkit_base_src_dir)/controls/text-input/text-input-impl.cpp \
- $(toolkit_base_src_dir)/controls/text-input/text-input-popup-impl.cpp \
- $(toolkit_base_src_dir)/controls/text-view/relayout-utilities.cpp \
- $(toolkit_base_src_dir)/controls/text-view/split-by-new-line-char-policies.cpp \
- $(toolkit_base_src_dir)/controls/text-view/split-by-word-policies.cpp \
- $(toolkit_base_src_dir)/controls/text-view/split-by-char-policies.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-actor-cache.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-processor.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-processor-bidirectional-info.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-view-impl.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-view-character-processor.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-view-paragraph-processor.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-view-processor.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-view-processor-dbg.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-view-processor-helper-functions.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-view-word-processor.cpp \
- $(toolkit_base_src_dir)/focus-manager/focus-manager-impl.cpp \
- $(toolkit_base_src_dir)/focus-manager/keyboard-focus-manager-impl.cpp \
- $(toolkit_base_src_dir)/focus-manager/keyinput-focus-manager-impl.cpp \
- $(toolkit_base_src_dir)/styling/style-manager-impl.cpp \
- $(toolkit_base_src_dir)/builder/builder-impl.cpp \
- $(toolkit_base_src_dir)/builder/builder-animations.cpp \
- $(toolkit_base_src_dir)/builder/builder-set-property.cpp \
- $(toolkit_base_src_dir)/builder/builder-signals.cpp \
- $(toolkit_base_src_dir)/builder/builder-actor.cpp \
- $(toolkit_base_src_dir)/builder/json-parser-state.cpp \
- $(toolkit_base_src_dir)/builder/json-parser-impl.cpp \
- $(toolkit_base_src_dir)/builder/tree-node-manipulator.cpp \
- $(toolkit_base_src_dir)/builder/replacement.cpp
+++ /dev/null
-# Add local source files here
-
-public_api_base_src_files = \
- $(public_api_base_src_dir)/enums.cpp \
- $(public_api_base_src_dir)/controls/control.cpp \
- $(public_api_base_src_dir)/controls/control-impl.cpp \
- $(public_api_base_src_dir)/controls/alignment/alignment.cpp \
- $(public_api_base_src_dir)/controls/buttons/button.cpp \
- $(public_api_base_src_dir)/controls/buttons/check-box-button.cpp \
- $(public_api_base_src_dir)/controls/buttons/push-button.cpp \
- $(public_api_base_src_dir)/controls/buttons/radio-button.cpp \
- $(public_api_base_src_dir)/controls/default-controls/solid-color-actor.cpp \
- $(public_api_base_src_dir)/controls/default-controls/check-button-factory.cpp \
- $(public_api_base_src_dir)/controls/default-controls/push-button-factory.cpp \
- $(public_api_base_src_dir)/controls/popup/popup.cpp \
- $(public_api_base_src_dir)/controls/scroll-bar/scroll-bar.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/item-factory.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/item-layout.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/item-view.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/depth-layout.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/grid-layout.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/navigation-layout.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/roll-layout.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/spiral-layout.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scrollable.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-connector.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-component-impl.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-component.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp \
- $(public_api_base_src_dir)/controls/table-view/table-view.cpp \
- $(public_api_base_src_dir)/controls/text-input/text-input.cpp \
- $(public_api_base_src_dir)/controls/text-view/text-view.cpp \
- $(public_api_base_src_dir)/focus-manager/focus-manager.cpp \
- $(public_api_base_src_dir)/focus-manager/keyboard-focus-manager.cpp \
- $(public_api_base_src_dir)/focus-manager/keyinput-focus-manager.cpp \
- $(public_api_base_src_dir)/markup-processor/markup-processor.cpp \
- $(public_api_base_src_dir)/shader-effects/image-region-effect.cpp \
- $(public_api_base_src_dir)/shader-effects/bouncing-effect.cpp \
- $(public_api_base_src_dir)/styling/style-manager.cpp \
- $(public_api_base_src_dir)/builder/builder.cpp \
- $(public_api_base_src_dir)/builder/json-parser.cpp \
- $(public_api_base_src_dir)/builder/tree-node.cpp
-
-# Add public header files here
-
-public_api_base_header_files = \
- $(public_api_base_src_dir)/enums.h
-
-public_api_base_controls_header_files = \
- $(public_api_base_src_dir)/controls/control.h \
- $(public_api_base_src_dir)/controls/control-impl.h
-
-public_api_base_alignment_header_files = \
- $(public_api_base_src_dir)/controls/alignment/alignment.h
-
-public_api_base_buttons_header_files = \
- $(public_api_base_src_dir)/controls/buttons/check-box-button.h \
- $(public_api_base_src_dir)/controls/buttons/button.h \
- $(public_api_base_src_dir)/controls/buttons/push-button.h \
- $(public_api_base_src_dir)/controls/buttons/radio-button.h
-
-public_api_base_default_controls_header_files = \
- $(public_api_base_src_dir)/controls/default-controls/check-button-factory.h \
- $(public_api_base_src_dir)/controls/default-controls/solid-color-actor.h \
- $(public_api_base_src_dir)/controls/default-controls/push-button-factory.h
-
-public_api_base_item_view_header_files = \
- $(public_api_base_src_dir)/controls/scrollable/item-view/depth-layout.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/roll-layout.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/spiral-layout.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/navigation-layout.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/grid-layout.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/item-factory.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/item-layout.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/item-view.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/item-view-declarations.h
-
-public_api_base_popup_header_files = \
- $(public_api_base_src_dir)/controls/popup/popup.h
-
-public_api_base_scrollable_header_files = \
- $(public_api_base_src_dir)/controls/scrollable/scroll-component-impl.h \
- $(public_api_base_src_dir)/controls/scrollable/scrollable.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-connector.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-component.h
-
-public_api_base_scroll_bar_header_files = \
- $(public_api_base_src_dir)/controls/scroll-bar/scroll-bar.h
-
-public_api_base_scroll_view_header_files = \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h
-
-public_api_base_table_view_header_files = \
- $(public_api_base_src_dir)/controls/table-view/table-view.h
-
-public_api_base_text_input_header_files = \
- $(public_api_base_src_dir)/controls/text-input/text-input.h
-
-public_api_base_text_view_header_files = \
- $(public_api_base_src_dir)/controls/text-view/text-view.h
-
-public_api_base_focus_manager_header_files = \
- $(public_api_base_src_dir)/focus-manager/keyinput-focus-manager.h \
- $(public_api_base_src_dir)/focus-manager/focus-manager.h \
- $(public_api_base_src_dir)/focus-manager/keyboard-focus-manager.h
-
-public_api_base_markup_processor_header_files = \
- $(public_api_base_src_dir)/markup-processor/markup-processor.h
-
-public_api_base_shader_effects_header_files = \
- $(public_api_base_src_dir)/shader-effects/bouncing-effect.h \
- $(public_api_base_src_dir)/shader-effects/dissolve-effect.h \
- $(public_api_base_src_dir)/shader-effects/image-region-effect.h \
- $(public_api_base_src_dir)/shader-effects/iris-effect.h \
- $(public_api_base_src_dir)/shader-effects/mask-effect.h \
- $(public_api_base_src_dir)/shader-effects/nine-patch-mask-effect.h \
- $(public_api_base_src_dir)/shader-effects/page-turn-book-spine-effect.h \
- $(public_api_base_src_dir)/shader-effects/page-turn-effect.h \
- $(public_api_base_src_dir)/shader-effects/ripple-effect.h \
- $(public_api_base_src_dir)/shader-effects/ripple2d-effect.h \
- $(public_api_base_src_dir)/shader-effects/swirl-effect.h
-
-public_api_base_styling_header_files = \
- $(public_api_base_src_dir)/styling/style-manager.h
-
-public_api_base_builder_header_files = \
- $(public_api_base_src_dir)/builder/builder.h \
- $(public_api_base_src_dir)/builder/json-parser.h \
- $(public_api_base_src_dir)/builder/tree-node.h
-
+++ /dev/null
-# Files to install here
-
-dali_toolkit_base_sound_files =\
- $(toolkit_base_sounds_dir)/*.ogg
[dali_profile=$enableval],
[dali_profile=COMMON])
-# Different platforms use either the full Toolkit or the basic version
-# The basic version excludes components under dali-toolkit/optional
-AM_CONDITIONAL([TOOLKIT_BASIC_VERSION], [test x$dali_profile = xLITE])
-
if test x$DALI_DATA_RW_DIR != x; then
dataReadWriteDir=${DALI_DATA_RW_DIR}/
else
# Build the Dali Toolkit library
-# Base files
-toolkit_base_images_dir = ../../../base/dali-toolkit/images
-toolkit_base_sounds_dir = ../../../base/dali-toolkit/sounds
-toolkit_base_styles_dir = ../../../base/dali-toolkit/styles
-toolkit_base_src_dir = ../../../base/dali-toolkit/internal
-public_api_base_src_dir = ../../../base/dali-toolkit/public-api
-
-include ../../../base/dali-toolkit/images/file.list
-include ../../../base/dali-toolkit/sounds/file.list
-include ../../../base/dali-toolkit/styles/file.list
-include ../../../base/dali-toolkit/internal/file.list
-include ../../../base/dali-toolkit/public-api/file.list
-
-# Optional files
-toolkit_optional_images_dir = ../../../optional/dali-toolkit/images
-toolkit_optional_src_dir = ../../../optional/dali-toolkit/internal
-public_api_optional_src_dir = ../../../optional/dali-toolkit/public-api
-
-include ../../../optional/dali-toolkit/images/file.list
-include ../../../optional/dali-toolkit/internal/file.list
-include ../../../optional/dali-toolkit/public-api/file.list
+toolkit_images_dir = ../../../dali-toolkit/images
+toolkit_sounds_dir = ../../../dali-toolkit/sounds
+toolkit_styles_dir = ../../../dali-toolkit/styles
+toolkit_src_dir = ../../../dali-toolkit/internal
+public_api_src_dir = ../../../dali-toolkit/public-api
+
+include ../../../dali-toolkit/images/file.list
+include ../../../dali-toolkit/sounds/file.list
+include ../../../dali-toolkit/styles/file.list
+include ../../../dali-toolkit/internal/file.list
+include ../../../dali-toolkit/public-api/file.list
resources_dir = ../../../resources
daliimagedir = ${dataReadOnlyDir}/toolkit/images/
-if TOOLKIT_BASIC_VERSION
-daliimage_DATA = ${dali_toolkit_base_image_files}
-else
-daliimage_DATA = ${dali_toolkit_base_image_files} \
- ${dali_toolkit_optional_image_files}
-endif # TOOLKIT_BASIC_VERSION
+daliimage_DATA = ${dali_toolkit_image_files}
dalisounddir = ${dataReadOnlyDir}/toolkit/sounds/
-dalisound_DATA = ${dali_toolkit_base_sound_files}
+dalisound_DATA = ${dali_toolkit_sound_files}
# The library
lib_LTLIBRARIES = libdali-toolkit.la
-if TOOLKIT_BASIC_VERSION
libdali_toolkit_la_SOURCES = \
- $(toolkit_base_src_files) \
- $(public_api_base_src_files)
-else
-libdali_toolkit_la_SOURCES = \
- $(toolkit_base_src_files) \
- $(public_api_base_src_files) \
- $(toolkit_optional_src_files) \
- $(public_api_optional_src_files)
-endif # TOOLKIT_BASIC_VERSION
+ $(toolkit_src_files) \
+ $(public_api_src_files)
dalistyledir = ${dataReadOnlyDir}/toolkit/styles/
dalistyle_DATA = ${dali_toolkit_style_files}
libdali_toolkit_la_DEPENDENCIES =
-toolkit_basic_includes = -I../../../base
-
-if ! TOOLKIT_BASIC_VERSION
-toolkit_optional_includes = -I../../../optional
-endif
-
libdali_toolkit_la_CXXFLAGS = -DDALI_COMPILATION \
-DDALI_IMAGE_DIR="\"${daliimagedir}\"" \
-DDALI_SOUND_DIR="\"${dalisounddir}\"" \
-DDALI_STYLE_DIR="\"${dalistyledir}\"" \
-DDALI_DATA_READ_ONLY_DIR="\"${dataReadOnlyDir}\"" \
-Werror -Wall \
- $(toolkit_basic_includes) \
- $(toolkit_optional_includes) \
+ -I../../../ \
$(DALI_TOOLKIT_CFLAGS) \
$(DALICORE_CFLAGS) \
$(DALI_CFLAGS) \
$(FRIBIDI_LIBS) \
$(HTMLCXX_LIBS)
-# Install Base headers
-
-toplevelbasedir = $(devincludepath)/dali-toolkit
-
-publicapibasedir = $(toplevelbasedir)/public-api
-publicapibasecontrolsdir = $(publicapibasedir)/controls
-publicapibasealignmentdir = $(publicapibasedir)/controls/alignment
-publicapibasebuttonsdir = $(publicapibasedir)/controls/buttons
-publicapibasedefaultcontrolsdir = $(publicapibasedir)/controls/default-controls
-publicapibaseitemviewdir = $(publicapibasedir)/controls/scrollable/item-view
-publicapibasepopupdir = $(publicapibasedir)/controls/popup
-publicapibasescrollbardir = $(publicapibasedir)/controls/scroll-bar
-publicapibasescrollcomponentdir = $(publicapibasedir)/controls/scroll-component
-publicapibasescrollabledir = $(publicapibasedir)/controls/scrollable
-publicapibasescrollviewdir = $(publicapibasedir)/controls/scrollable/scroll-view
-publicapibasetableviewdir = $(publicapibasedir)/controls/table-view
-publicapibasetextviewdir = $(publicapibasedir)/controls/text-view
-publicapibasetextinputdir = $(publicapibasedir)/controls/text-input
-publicapibasefactorydir = $(publicapibasedir)/factory
-publicapibasefocusmanagerdir = $(publicapibasedir)/focus-manager
-publicapibasemarkupprocessordir = $(publicapibasedir)/markup-processor
-publicapibaseshadereffectsdir = $(publicapibasedir)/shader-effects
-publicapibasestylingdir = $(publicapibasedir)/styling
-publicapibasebuilderdir = $(publicapibasedir)/builder
-
-publicapibase_HEADERS = $(public_api_base_header_files)
-publicapibasecontrols_HEADERS = $(public_api_base_controls_header_files)
-publicapibasealignment_HEADERS = $(public_api_base_alignment_header_files)
-publicapibasebuttons_HEADERS = $(public_api_base_buttons_header_files)
-publicapibasedefaultcontrols_HEADERS = $(public_api_base_default_controls_header_files)
-publicapibaseitemview_HEADERS = $(public_api_base_item_view_header_files)
-publicapibasepopup_HEADERS = $(public_api_base_popup_header_files)
-publicapibasescrollbar_HEADERS = $(public_api_base_scroll_bar_header_files)
-publicapibasescrollcomponent_HEADERS = $(public_api_base_scroll_component_header_files)
-publicapibasescrollable_HEADERS = $(public_api_base_scrollable_header_files)
-publicapibasescrollview_HEADERS = $(public_api_base_scroll_view_header_files)
-publicapibasetableview_HEADERS = $(public_api_base_table_view_header_files)
-publicapibasetextview_HEADERS = $(public_api_base_text_view_header_files)
-publicapibasetextinput_HEADERS = $(public_api_base_text_input_header_files)
-publicapibasefocusmanager_HEADERS = $(public_api_base_focus_manager_header_files)
-publicapibasemarkupprocessor_HEADERS = $(public_api_base_markup_processor_header_files)
-publicapibaseshadereffects_HEADERS = $(public_api_base_shader_effects_header_files)
-publicapibasestyling_HEADERS = $(public_api_base_styling_header_files)
-publicapibasebuilder_HEADERS = $(public_api_base_builder_header_files)
-
-# Install Optional headers
-
-topleveloptionaldir = $(devincludepath)/dali-toolkit
-topleveloptional_HEADERS = ../../../optional/dali-toolkit/dali-toolkit.h
-
-publicapioptionaldir = $(topleveloptionaldir)/public-api
-publicapioptionalcontrolsdir = $(publicapioptionaldir)/controls
-publicapioptionalbloomviewdir = $(publicapioptionaldir)/controls/bloom-view
-publicapioptionalclusterdir = $(publicapioptionaldir)/controls/cluster
-publicapioptionaleffectsviewdir = $(publicapioptionaldir)/controls/effects-view
-publicapioptionalgaussianblurviewdir = $(publicapioptionaldir)/controls/gaussian-blur-view
-publicapioptionalimageviewdir = $(publicapioptionaldir)/controls/image-view
-publicapioptionalmagnifierdir = $(publicapioptionaldir)/controls/magnifier
-publicapioptionalpageturnviewdir = $(publicapioptionaldir)/controls/page-turn-view
-publicapioptionalsliderdir = $(publicapioptionaldir)/controls/slider
-publicapioptionaltoolbardir = $(publicapioptionaldir)/controls/tool-bar
-publicapioptionalselectorsdir = $(publicapioptionaldir)/controls/selectors
-publicapioptionalshadowviewdir = $(publicapioptionaldir)/controls/shadow-view
-publicapioptionalbubbleemitterdir = $(publicapioptionaldir)/controls/bubble-effect
-publicapioptionalsuperblurviewdir = $(publicapioptionaldir)/controls/super-blur-view
-publicapioptionalviewdir = $(publicapioptionaldir)/controls/view
-publicapioptionalnavigationframedir = $(publicapioptionaldir)/controls/navigation-frame
-publicapioptionalshadereffectsdir = $(publicapioptionaldir)/shader-effects
-publicapioptionalbubbleeffectdir = $(publicapioptionaldir)/shader-effects/bubble-effect
-publicapioptionaltransitioneffectsdir = $(publicapioptionaldir)/transition-effects
-
-publicapioptional_HEADERS = $(public_api_optional_header_files)
-publicapioptionalcontrols_HEADERS = $(public_api_optional_controls_header_files)
-publicapioptionalbloomview_HEADERS = $(public_api_optional_bloom_view_header_files)
-publicapioptionalcluster_HEADERS = $(public_api_optional_cluster_header_files)
-publicapioptionaleffectsview_HEADERS = $(public_api_optional_effects_view_header_files)
-publicapioptionalgaussianblurview_HEADERS = $(public_api_optional_gaussian_blur_view_header_files)
-publicapioptionalimageview_HEADERS = $(public_api_optional_image_view_header_files)
-publicapioptionalmagnifier_HEADERS = $(public_api_optional_magnifier_header_files)
-publicapioptionalpageturnview_HEADERS = $(public_api_optional_page_turn_view_header_files)
-publicapioptionalslider_HEADERS = $(public_api_optional_slider_header_files)
-publicapioptionaltoolbar_HEADERS = $(public_api_optional_tool_bar_header_files)
-publicapioptionalselectors_HEADERS = $(public_api_optional_selectors_header_files)
-publicapioptionalshadowview_HEADERS = $(public_api_optional_shadow_view_header_files)
-publicapioptionalbubbleemitter_HEADERS = $(public_api_optional_bubble_emitter_header_files)
-publicapioptionalsuperblurview_HEADERS = $(public_api_optional_super_blur_view_header_files)
-publicapioptionalview_HEADERS = $(public_api_optional_view_header_files)
-publicapioptionalnavigationframe_HEADERS = $(public_api_optional_navigation_frame_header_files)
-publicapioptionalshadereffects_HEADERS = $(public_api_optional_shader_effects_header_files)
-publicapioptionalbubbleeffect_HEADERS = $(public_api_optional_bubble_effect_header_files)
-publicapioptionaltransitioneffects_HEADERS = $(public_api_optional_transition_effects_header_files)
+# Install headers
+
+topleveldir = $(devincludepath)/dali-toolkit
+toplevel_HEADERS = ../../../dali-toolkit/dali-toolkit.h
+
+publicapidir = $(topleveldir)/public-api
+
+publicapicontrolsdir = $(publicapidir)/controls
+publicapialignmentdir = $(publicapicontrolsdir)/alignment
+publicapibloomviewdir = $(publicapicontrolsdir)/bloom-view
+publicapibubbleemitterdir = $(publicapicontrolsdir)/bubble-effect
+publicapibuttonsdir = $(publicapicontrolsdir)/buttons
+publicapiclusterdir = $(publicapicontrolsdir)/cluster
+publicapidefaultcontrolsdir = $(publicapicontrolsdir)/default-controls
+publicapieffectsviewdir = $(publicapicontrolsdir)/effects-view
+publicapigaussianblurviewdir = $(publicapicontrolsdir)/gaussian-blur-view
+publicapiimageviewdir = $(publicapicontrolsdir)/image-view
+publicapiitemviewdir = $(publicapicontrolsdir)/scrollable/item-view
+publicapimagnifierdir = $(publicapicontrolsdir)/magnifier
+publicapinavigationframedir = $(publicapicontrolsdir)/navigation-frame
+publicapipageturnviewdir = $(publicapicontrolsdir)/page-turn-view
+publicapipopupdir = $(publicapicontrolsdir)/popup
+publicapiscrollbardir = $(publicapicontrolsdir)/scroll-bar
+publicapiscrollcomponentdir = $(publicapicontrolsdir)/scroll-component
+publicapiscrollabledir = $(publicapicontrolsdir)/scrollable
+publicapiscrollviewdir = $(publicapicontrolsdir)/scrollable/scroll-view
+publicapiselectorsdir = $(publicapicontrolsdir)/selectors
+publicapishadowviewdir = $(publicapicontrolsdir)/shadow-view
+publicapisliderdir = $(publicapicontrolsdir)/slider
+publicapisuperblurviewdir = $(publicapicontrolsdir)/super-blur-view
+publicapitableviewdir = $(publicapicontrolsdir)/table-view
+publicapitextviewdir = $(publicapicontrolsdir)/text-view
+publicapitextinputdir = $(publicapicontrolsdir)/text-input
+publicapitoolbardir = $(publicapicontrolsdir)/tool-bar
+publicapiviewdir = $(publicapicontrolsdir)/view
+
+publicapibuilderdir = $(publicapidir)/builder
+publicapifocusmanagerdir = $(publicapidir)/focus-manager
+publicapimarkupprocessordir = $(publicapidir)/markup-processor
+publicapishadereffectsdir = $(publicapidir)/shader-effects
+publicapibubbleeffectdir = $(publicapidir)/shader-effects/bubble-effect
+publicapistylingdir = $(publicapidir)/styling
+publicapitransitioneffectsdir = $(publicapidir)/transition-effects
+
+publicapi_HEADERS = $(public_api_header_files)
+publicapicontrols_HEADERS = $(public_api_controls_header_files)
+publicapialignment_HEADERS = $(public_api_alignment_header_files)
+publicapibloomview_HEADERS = $(public_api_bloom_view_header_files)
+publicapibubbleemitter_HEADERS = $(public_api_bubble_emitter_header_files)
+publicapibuttons_HEADERS = $(public_api_buttons_header_files)
+publicapicluster_HEADERS = $(public_api_cluster_header_files)
+publicapidefaultcontrols_HEADERS = $(public_api_default_controls_header_files)
+publicapieffectsview_HEADERS = $(public_api_effects_view_header_files)
+publicapigaussianblurview_HEADERS = $(public_api_gaussian_blur_view_header_files)
+publicapiimageview_HEADERS = $(public_api_image_view_header_files)
+publicapiitemview_HEADERS = $(public_api_item_view_header_files)
+publicapimagnifier_HEADERS = $(public_api_magnifier_header_files)
+publicapinavigationframe_HEADERS = $(public_api_navigation_frame_header_files)
+publicapipageturnview_HEADERS = $(public_api_page_turn_view_header_files)
+publicapipopup_HEADERS = $(public_api_popup_header_files)
+publicapiscrollbar_HEADERS = $(public_api_scroll_bar_header_files)
+publicapiscrollcomponent_HEADERS = $(public_api_scroll_component_header_files)
+publicapiscrollable_HEADERS = $(public_api_scrollable_header_files)
+publicapiscrollview_HEADERS = $(public_api_scroll_view_header_files)
+publicapiselectors_HEADERS = $(public_api_selectors_header_files)
+publicapishadowview_HEADERS = $(public_api_shadow_view_header_files)
+publicapislider_HEADERS = $(public_api_slider_header_files)
+publicapisuperblurview_HEADERS = $(public_api_super_blur_view_header_files)
+publicapitableview_HEADERS = $(public_api_table_view_header_files)
+publicapitextview_HEADERS = $(public_api_text_view_header_files)
+publicapitextinput_HEADERS = $(public_api_text_input_header_files)
+publicapitoolbar_HEADERS = $(public_api_tool_bar_header_files)
+publicapiview_HEADERS = $(public_api_view_header_files)
+
+publicapibuilder_HEADERS = $(public_api_builder_header_files)
+publicapifocusmanager_HEADERS = $(public_api_focus_manager_header_files)
+publicapimarkupprocessor_HEADERS = $(public_api_markup_processor_header_files)
+publicapishadereffects_HEADERS = $(public_api_shader_effects_header_files)
+publicapibubbleeffect_HEADERS = $(public_api_bubble_effect_header_files)
+publicapistyling_HEADERS = $(public_api_styling_header_files)
+publicapitransitioneffects_HEADERS = $(public_api_transition_effects_header_files)
# Note: If this tag is empty the current directory is searched.
INPUT = @DOXYGEN_DOCS_DIR@/content \
- ../../../../dali-toolkit/base/dali-toolkit/public-api \
- ../../../../dali-toolkit/optional/dali-toolkit/public-api \
+ ../../../../dali-toolkit/dali-toolkit/public-api \
../../../automated-tests/README.md \
@prefix@/include/dali
-#ifndef __DALI_TOOLKIT_INTERNAL_H__
-#define __DALI_TOOLKIT_INTERNAL_H__
+#ifndef __DALI_TOOLKIT_H__
+#define __DALI_TOOLKIT_H__
/*
* Copyright (c) 2014 Samsung Electronics Co., Ltd.
// Toolkit
#include <dali-toolkit/public-api/controls/alignment/alignment.h>
+#include <dali-toolkit/public-api/controls/bloom-view/bloom-view.h>
+#include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
#include <dali-toolkit/public-api/controls/buttons/button.h>
+#include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
#include <dali-toolkit/public-api/controls/buttons/push-button.h>
#include <dali-toolkit/public-api/controls/buttons/radio-button.h>
#include <dali-toolkit/public-api/controls/cluster/cluster-style.h>
+#include <dali-toolkit/public-api/controls/cluster/cluster.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
-#include <dali-toolkit/public-api/controls/default-controls/push-button-factory.h>
-#include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
-#include <dali-toolkit/public-api/controls/popup/popup.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
-#include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
-#include <dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h>
-#include <dali-toolkit/public-api/controls/text-input/text-input.h>
-#include <dali-toolkit/public-api/controls/text-view/text-view.h>
-#include <dali-toolkit/public-api/enums.h>
-#include <dali-toolkit/public-api/focus-manager/focus-manager.h>
-#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
-#include <dali-toolkit/public-api/markup-processor/markup-processor.h>
-#include <dali-toolkit/public-api/shader-effects/dissolve-effect.h>
-#include <dali-toolkit/public-api/shader-effects/image-region-effect.h>
-#include <dali-toolkit/public-api/shader-effects/iris-effect.h>
-#include <dali-toolkit/public-api/shader-effects/mask-effect.h>
-#include <dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h>
-#include <dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h>
-#include <dali-toolkit/public-api/shader-effects/page-turn-effect.h>
-#include <dali-toolkit/public-api/shader-effects/ripple-effect.h>
-#include <dali-toolkit/public-api/shader-effects/ripple2d-effect.h>
-#include <dali-toolkit/public-api/shader-effects/swirl-effect.h>
-
-// INTERNAL INCLUDES
-
-#include <dali-toolkit/public-api/controls/bloom-view/bloom-view.h>
-#include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
-#include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
-#include <dali-toolkit/public-api/controls/cluster/cluster.h>
-
#include <dali-toolkit/public-api/controls/default-controls/check-button-factory.h>
-
+#include <dali-toolkit/public-api/controls/default-controls/push-button-factory.h>
+#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
#include <dali-toolkit/public-api/controls/effects-view/effects-view.h>
#include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
-#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
#include <dali-toolkit/public-api/controls/magnifier/magnifier.h>
+#include <dali-toolkit/public-api/controls/navigation-frame/navigation-control.h>
+#include <dali-toolkit/public-api/controls/navigation-frame/page.h>
+#include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h>
#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
-
+#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h>
+#include <dali-toolkit/public-api/controls/popup/popup.h>
#include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-component.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>
#include <dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
#include <dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h>
#include <dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h>
#include <dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
+#include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
#include <dali-toolkit/public-api/controls/shadow-view/shadow-view.h>
#include <dali-toolkit/public-api/controls/slider/slider.h>
+#include <dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h>
#include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/public-api/controls/text-input/text-input.h>
+#include <dali-toolkit/public-api/controls/text-view/text-view.h>
#include <dali-toolkit/public-api/controls/tool-bar/tool-bar.h>
#include <dali-toolkit/public-api/controls/view/view.h>
-#include <dali-toolkit/public-api/controls/navigation-frame/navigation-control.h>
-#include <dali-toolkit/public-api/controls/navigation-frame/page.h>
-
+#include <dali-toolkit/public-api/focus-manager/focus-manager.h>
+#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
#include <dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h>
+#include <dali-toolkit/public-api/markup-processor/markup-processor.h>
+
#include <dali-toolkit/public-api/shader-effects/alpha-discard-effect.h>
#include <dali-toolkit/public-api/shader-effects/bendy-effect.h>
#include <dali-toolkit/public-api/shader-effects/blind-effect.h>
#include <dali-toolkit/public-api/shader-effects/water-effect.h>
#include <dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h>
#include <dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h>
+#include <dali-toolkit/public-api/shader-effects/dissolve-effect.h>
+#include <dali-toolkit/public-api/shader-effects/image-region-effect.h>
+#include <dali-toolkit/public-api/shader-effects/iris-effect.h>
+#include <dali-toolkit/public-api/shader-effects/mask-effect.h>
+#include <dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h>
+#include <dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h>
+#include <dali-toolkit/public-api/shader-effects/page-turn-effect.h>
+#include <dali-toolkit/public-api/shader-effects/ripple-effect.h>
+#include <dali-toolkit/public-api/shader-effects/ripple2d-effect.h>
+#include <dali-toolkit/public-api/shader-effects/swirl-effect.h>
#include <dali-toolkit/public-api/transition-effects/cube-transition-effect.h>
#include <dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h>
#include <dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h>
#include <dali-toolkit/public-api/dali-toolkit-version.h>
+#include <dali-toolkit/public-api/enums.h>
-#endif // __DALI_TOOLKIT_EXT_H__
+#endif // __DALI_TOOLKIT_H__
--- /dev/null
+# Files to install here
+
+dali_toolkit_image_files =\
+ $(toolkit_images_dir)/*.png
return mPadding;
}
-void Alignment::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void Alignment::OnRelayout( const Vector2& size, ActorSizeContainer& container )
{
// lay out the actors
Vector3 anchorPointAndParentOrigin = Vector3::ZERO;
private: // From Control
/**
- * @copydoc Control::OnRelaidOut()
+ * @copydoc Control::OnRelayout()
*/
- virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+ virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
private:
SetSelected(!mSelected);
}
-void RadioButton::OnRelaidOut( Vector2 /*size*/, ActorSizeContainer& container )
+void RadioButton::OnRelayout( const Vector2& /*size*/, ActorSizeContainer& container )
{
Vector3 newSize( mRadioIcon.GetNaturalSize() );
void ToggleState();
/**
- * @copydoc Dali::Toolkit::Control::OnRelaidOut(Vector2 size, ActorSizeContainer& container)
+ * @copydoc Dali::Toolkit::Control::OnRelayout()
*/
- virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+ virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
public:
// Properties
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/cluster/cluster-style.h>
+#include <dali-toolkit/internal/controls/cluster/cluster-style-impl.h>
using namespace Dali;
{
}
+void Cluster::OnControlSizeSet( const Vector3& targetSize )
+{
+ mClusterSize = targetSize;
+ GetImpl(mClusterStyle).SetClusterSize(targetSize);
+
+ for(ChildInfoIter iter = mChildren.begin(); iter != mChildren.end(); ++iter)
+ {
+
+ if((*iter).mActor)
+ {
+ mClusterStyle.ApplyStyle( (*iter).mActor,
+ (*iter).mPositionIndex,
+ AlphaFunctions::EaseOut,
+ 0.f );
+ }
+ }
+
+ UpdateBackground(0.f);
+ UpdateTitle(0.f);
+}
+
Cluster::~Cluster()
{
}
{
unsigned int previousChildrenNum = mChildren.size();
mClusterStyle = style;
+ GetImpl(mClusterStyle).SetClusterSize(mClusterSize);
unsigned int newChildrenNum = mClusterStyle.GetMaximumNumberOfChildren();
// New style supports less children (remove those that no longer belong)
mChildren.erase( removeStart, mChildren.end() );
}
- // Remove constraints from previous style, and apply new style's constraints.
for(ChildInfoIter iter = mChildren.begin(); iter != mChildren.end(); ++iter)
{
if((*iter).mActor)
{
- (*iter).mActor.RemoveConstraints();
- style.ApplyStyle( (*iter).mActor,
+ mClusterStyle.ApplyStyle( (*iter).mActor,
(*iter).mPositionIndex,
AlphaFunctions::EaseOut,
CLUSTER_STYLE_CONSTRAINT_DURATION );
{
if (mBackgroundImage)
{
- mBackgroundImage.RemoveConstraints();
mClusterStyle.ApplyStyleToBackground(mBackgroundImage, AlphaFunctions::EaseOut, duration);
}
}
{
if (mTitle)
{
- mTitle.RemoveConstraints();
mClusterStyle.ApplyStyleToTitle(mTitle, AlphaFunctions::EaseOut, duration);
}
}
*/
virtual void OnInitialize();
+ /**
+ *
+ * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
+ */
+ virtual void OnControlSizeSet( const Vector3& targetSize );
+
protected:
/**
Toolkit::ClusterStyle mClusterStyle;
ChildInfoContainer mChildren;
+ Vector3 mClusterSize;
Actor mBackgroundImage; ///< Stores the background image.
Actor mTitle; ///< Stores the text title.
#include <dali-toolkit/internal/controls/cluster/cluster-style-impl.h>
// EXTERNAL INCLUDES
-
+#include <dali/public-api/animation/animation.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/cluster/cluster.h>
const int STYLE_RANDOM_CHILDREN_NUMBER = 16;
-// Constraints
-
-/**
- * First order equation of the form y = Mx + C
- * current' = current * relative + offset
- */
-struct FirstOrderEquationConstraint
-{
- /**
- * @param relative The relative multiplier of the source property
- * @param offset The offset to add onto the result.
- */
- FirstOrderEquationConstraint(Vector3 relative, Vector3 offset = Vector3::ZERO)
- : mRelative(relative),
- mOffset(offset)
- {
- }
-
- Vector3 operator()(const Vector3& current,
- const PropertyInput& sourceProperty)
- {
- const Vector3 source = sourceProperty.GetVector3();
-
- return source * mRelative + mOffset;
- }
-
-public:
-
- Vector3 mRelative;
- Vector3 mOffset;
-};
-
-/**
- * Depth Constraint.
- * current' = current.xy | + Vector3::ONE.z
- */
-struct DepthConstraint
+Vector3 FirstOrderEquation( const Vector3& source, const Vector3& relative, const Vector3& offset = Vector3::ZERO )
{
- /**
- * constructor
- */
- DepthConstraint()
- {
- }
-
- Vector3 operator()(const Vector3& current,
- const PropertyInput& depthProperty)
- {
- Vector3 position(current);
- position.z = depthProperty.GetFloat();
- return position;
- }
-};
-
-
-/**
- * Position Constraint.
- * current' = current * relative + offset
- */
-struct PositionConstraint
-{
- /**
- * @param relative The relative multiplier of the source property
- * @param offset The offset to add onto the result.
- */
- PositionConstraint(Vector3 relative, Vector3 offset = Vector3::ZERO)
- : mRelative(relative),
- mOffset(offset)
- {
- }
-
- Vector3 operator()(const Vector3& current,
- const PropertyInput& sourceProperty,
- const PropertyInput& depthProperty)
- {
- const Vector3 source = sourceProperty.GetVector3();
-
- Vector3 position(source * mRelative + mOffset);
- position.z += depthProperty.GetFloat();
- return position;
- }
-
-public:
-
- Vector3 mRelative;
- Vector3 mOffset;
-};
-
-template <class T>
-struct SetConstraint
-{
- SetConstraint(T value)
- : mValue(value)
- {
-
- }
-
- T operator()(const T& current)
- {
- return mValue;
- }
-
- T mValue;
-};
+ return source * relative + offset;
+}
// random data generator //////////////////////////////////////////////////////
mTitleSize(Vector3::ONE),
mBackgroundPositionRelative(Vector3::ONE),
mBackgroundPositionOffset(Vector3::ZERO),
- mBackgroundSize(Vector3::ONE)
+ mBackgroundSize(Vector3::ONE),
+ mClusterSize( Vector3::ZERO )
{
}
return mMaxChildren;
}
+void ClusterStyle::ApplyStyleToBackground(Actor background, AlphaFunction alpha, const TimePeriod& durationSeconds)
+{
+ Apply( background,
+ FirstOrderEquation( GetClusterSize(), mBackgroundPositionRelative, mBackgroundPositionOffset ),
+ FirstOrderEquation( GetClusterSize(), mBackgroundSize ),
+ alpha,
+ durationSeconds);
+}
+
+void ClusterStyle::ApplyStyleToTitle(Actor title, AlphaFunction alpha, const TimePeriod& durationSeconds)
+{
+ Apply( title,
+ FirstOrderEquation( GetClusterSize(), mTitlePositionRelative, mTitlePositionOffset ),
+ FirstOrderEquation( GetClusterSize(), mTitleSize ),
+ alpha,
+ durationSeconds);
+}
+
void ClusterStyle::SetTitleProperties(const Vector3& relativePosition,
const Vector3& offsetPosition,
const Vector3& size)
mBackgroundSize = size;
}
+void ClusterStyle::SetClusterSize( const Vector3& clusterSize )
+{
+ mClusterSize = clusterSize;
+}
+
+Vector3 ClusterStyle::GetClusterSize() const
+{
+ return mClusterSize;
+}
+
+void ClusterStyle::Apply( Actor actor,
+ const Vector3& position,
+ const Vector3& size,
+ AlphaFunction alpha,
+ const TimePeriod& durationSeconds)
+{
+ float animationDuration = durationSeconds.delaySeconds + durationSeconds.durationSeconds;
+ if( animationDuration > 0.f )
+ {
+ Animation animation = Animation::New(animationDuration);
+ animation.MoveTo( actor, position, alpha, durationSeconds.delaySeconds, durationSeconds.durationSeconds );
+ animation.Resize( actor, size, alpha, durationSeconds.delaySeconds, durationSeconds.durationSeconds );
+ animation.Play();
+ }
+ else
+ {
+ actor.SetPosition( position );
+ actor.SetSize( size );
+ }
+}
+
+void ClusterStyle::Apply( Actor actor,
+ const Vector3& position,
+ const Vector3& size,
+ const Quaternion& rotation,
+ const Vector3& scale,
+ AlphaFunction alpha,
+ const TimePeriod& durationSeconds)
+{
+ float animationDuration = durationSeconds.delaySeconds + durationSeconds.durationSeconds;
+ if( animationDuration > 0.f )
+ {
+ Animation animation = Animation::New(animationDuration);
+ animation.MoveTo( actor, position, alpha, durationSeconds.delaySeconds, durationSeconds.durationSeconds );
+ animation.Resize( actor, size, alpha, durationSeconds.delaySeconds, durationSeconds.durationSeconds );
+ animation.RotateTo( actor, rotation, alpha, durationSeconds.delaySeconds, durationSeconds.durationSeconds );
+ animation.ScaleTo( actor, scale, alpha, durationSeconds.delaySeconds, durationSeconds.durationSeconds );
+ animation.Play();
+ }
+ else
+ {
+ actor.SetPosition( position );
+ actor.SetSize( size );
+ actor.SetRotation( rotation );
+ actor.SetScale( scale );
+ }
+}
+
// ClusterStyleStandard ///////////////////////////////////////////////////////
ClusterStylePtr ClusterStyleStandard::New(StyleType style)
// counter top-left parent origin and top-left anchor point.
const Vector3 position = mPositions[index] - Vector3(0.5f, 0.5f, 0.0f) + Vector3(size, size, 0.0f) * 0.5f;
- Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
- ParentSource( Actor::SIZE ),
- FirstOrderEquationConstraint(Vector3(position.x, position.y, 0.0f),
- Vector3(0.0f, 0.0f, position.z)) );
-
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- child.ApplyConstraint(constraint);
-
- constraint = Constraint::New<Vector3>( Actor::SIZE,
- ParentSource( Actor::SIZE ),
- FirstOrderEquationConstraint(Vector3::ONE * size) );
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- child.ApplyConstraint(constraint);
-
- constraint = Constraint::New<Quaternion>( Actor::ROTATION,
- SetConstraint<Quaternion>(Quaternion()) );
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- child.ApplyConstraint(constraint);
-
- constraint = Constraint::New<Vector3>( Actor::SCALE,
- SetConstraint<Vector3>(Vector3::ONE) );
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- child.ApplyConstraint(constraint);
+ Apply( child,
+ FirstOrderEquation( GetClusterSize(), Vector3(position.x, position.y, 0.0f), Vector3(0.0f, 0.0f, position.z) ),
+ FirstOrderEquation( GetClusterSize(), Vector3::ONE * size ),
+ Quaternion(),
+ Vector3::ONE,
+ alpha,
+ durationSeconds);
}
}
-void ClusterStyleStandard::ApplyStyleToBackground(Actor background, AlphaFunction alpha, const TimePeriod& durationSeconds)
-{
- Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
- ParentSource( Actor::SIZE ),
- FirstOrderEquationConstraint(mBackgroundPositionRelative, mBackgroundPositionOffset) );
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- background.ApplyConstraint(constraint);
-
- constraint = Constraint::New<Vector3>( Actor::SIZE,
- ParentSource( Actor::SIZE ),
- FirstOrderEquationConstraint(mBackgroundSize) );
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- background.ApplyConstraint(constraint);
-}
-
-void ClusterStyleStandard::ApplyStyleToTitle(Actor title, AlphaFunction alpha, const TimePeriod& durationSeconds)
-{
- Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
- ParentSource( Actor::SIZE ),
- FirstOrderEquationConstraint(mTitlePositionRelative, mTitlePositionOffset) );
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- title.ApplyConstraint(constraint);
-
- constraint = Constraint::New<Vector3>( Actor::SIZE,
- ParentSource( Actor::SIZE ),
- FirstOrderEquationConstraint(mTitleSize) );
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- title.ApplyConstraint(constraint);
-}
-
// ClusterStyleRandom /////////////////////////////////////////////////////////
ClusterStylePtr ClusterStyleRandom::New()
0.0f);
Property::Index depthProperty = child.GetPropertyIndex(Toolkit::Cluster::CLUSTER_ACTOR_DEPTH);
+ float depthPropertyValue = child.GetProperty<float>( depthProperty );
- Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
- ParentSource( Actor::SIZE ),
- FirstOrderEquationConstraint( Vector3(position.x, position.y, 0.0f),
- Vector3(0.0f, 0.0f, position.z) ) );
-
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- child.ApplyConstraint(constraint);
-
- // this constraint overrides the Z position. setting it to cluster-actor-depth
- constraint = Constraint::New<Vector3>( Actor::POSITION,
- LocalSource( depthProperty ),
- DepthConstraint() );
-
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- child.ApplyConstraint(constraint);
-
- constraint = Constraint::New<Vector3>( Actor::SIZE,
- ParentSource( Actor::SIZE ),
- FirstOrderEquationConstraint(Vector3::ONE * size) );
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- child.ApplyConstraint(constraint);
-
- constraint = Constraint::New<Quaternion>( Actor::ROTATION,
- SetConstraint<Quaternion>(Quaternion(rotation, Vector3::ZAXIS)) );
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- child.ApplyConstraint(constraint);
-
- constraint = Constraint::New<Vector3>( Actor::SCALE,
- SetConstraint<Vector3>(Vector3::ONE) );
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- child.ApplyConstraint(constraint);
-}
-void ClusterStyleRandom::ApplyStyleToBackground(Actor background, AlphaFunction alpha, const TimePeriod& durationSeconds)
-{
- Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
- ParentSource( Actor::SIZE ),
- FirstOrderEquationConstraint(mBackgroundPositionRelative, mBackgroundPositionOffset) );
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- background.ApplyConstraint(constraint);
-
- constraint = Constraint::New<Vector3>( Actor::SIZE,
- ParentSource( Actor::SIZE ),
- FirstOrderEquationConstraint(mBackgroundSize) );
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- background.ApplyConstraint(constraint);
-}
-
-void ClusterStyleRandom::ApplyStyleToTitle(Actor title, AlphaFunction alpha, const TimePeriod& durationSeconds)
-{
- Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
- ParentSource( Actor::SIZE ),
- FirstOrderEquationConstraint(mTitlePositionRelative, mTitlePositionOffset) );
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- title.ApplyConstraint(constraint);
-
- constraint = Constraint::New<Vector3>( Actor::SIZE,
- ParentSource( Actor::SIZE ),
- FirstOrderEquationConstraint(mTitleSize) );
- constraint.SetApplyTime(durationSeconds);
- constraint.SetAlphaFunction(alpha);
- constraint.SetRemoveAction(Constraint::Bake);
- title.ApplyConstraint(constraint);
+ Apply( child,
+ FirstOrderEquation( GetClusterSize(), Vector3(position.x, position.y, 0.0f), Vector3(0.0f, 0.0f, depthPropertyValue) ),
+ FirstOrderEquation( GetClusterSize(), Vector3::ONE * size),
+ Quaternion(rotation, Vector3::ZAXIS),
+ Vector3::ONE,
+ alpha,
+ durationSeconds);
}
} // namespace Internal
/**
* @copydoc Toolkit::ClusterStyle::ApplyStyleToBackground
*/
- virtual void ApplyStyleToBackground(Actor background, AlphaFunction alpha, const TimePeriod& durationSeconds) = 0;
+ virtual void ApplyStyleToBackground(Actor background, AlphaFunction alpha, const TimePeriod& durationSeconds);
/**
* @copydoc Toolkit::ClusterStyle::ApplyStyleToTitle
*/
- virtual void ApplyStyleToTitle(Actor title, AlphaFunction alpha, const TimePeriod& durationSeconds) = 0;
+ virtual void ApplyStyleToTitle(Actor title, AlphaFunction alpha, const TimePeriod& durationSeconds);
+
+ /**
+ * Set the size of cluster
+ */
+ void SetClusterSize( const Vector3& clusterSize );
protected:
const Vector3& offsetPosition,
const Vector3& size);
+ /**
+ * Get the size of cluster.
+ * @return the cluster size
+ */
+ Vector3 GetClusterSize() const;
+
+ /**
+ * Apply the given position & size to the actor
+ * @param[in] position The target position
+ * @param[in] size The target size
+ * @param[in] size The size to resize to
+ * @param[in] alpha The alpha function to use.
+ * @param[in] durationSeconds The time period to apply this style.
+ */
+ void Apply( Actor actor,
+ const Vector3& position,
+ const Vector3& size,
+ AlphaFunction alpha,
+ const TimePeriod& durationSeconds);
+ /**
+ * Apply the given position & size to the actor
+ * @param[in] actor The actor to apply the changes
+ * @param[in] position The target position
+ * @param[in] size The target size
+ * @param[in] rotation The target Quaternion value
+ * @param[in] scale The target scale
+ * @param[in] alpha The alpha function to use.
+ * @param[in] durationSeconds The time period to apply this style.
+ */
+ void Apply( Actor actor,
+ const Vector3& position,
+ const Vector3& size,
+ const Quaternion& rotation,
+ const Vector3& scale,
+ AlphaFunction alpha,
+ const TimePeriod& durationSeconds);
+
protected:
/**
Vector3 mBackgroundPositionRelative; ///< Background's position relative to size of cluster
Vector3 mBackgroundPositionOffset; ///< Background's position offset
Vector3 mBackgroundSize; ///< Background's size relative to size of cluster
-
+ Vector3 mClusterSize; ///< The size of cluster
};
/**
*/
void ApplyStyle(Actor child, unsigned int index, AlphaFunction alpha, const TimePeriod& durationSeconds);
- /**
- * @copydoc Toolkit::ClusterStyle::ApplyStyleToBackground
- */
- void ApplyStyleToBackground(Actor background, AlphaFunction alpha, const TimePeriod& durationSeconds);
-
- /**
- * @copydoc Toolkit::ClusterStyle::ApplyStyleToTitle
- */
- void ApplyStyleToTitle(Actor title, AlphaFunction alpha, const TimePeriod& durationSeconds);
-
private:
/**
*/
void ApplyStyle(Actor child, unsigned int index, AlphaFunction alpha, const TimePeriod& durationSeconds);
- /**
- * @copydoc Toolkit::ClusterStyle::ApplyStyleToBackground
- */
- void ApplyStyleToBackground(Actor background, AlphaFunction alpha, const TimePeriod& durationSeconds);
-
- /**
- * @copydoc Toolkit::ClusterStyle::ApplyStyleToTitle
- */
- void ApplyStyleToTitle(Actor title, AlphaFunction alpha, const TimePeriod& durationSeconds);
-
protected:
/**
// Create actor to display result of off-screen rendering
mDestinationImageActor = ImageActor::New( mDestinationImage );
self.Add( mDestinationImageActor );
- mDestinationImageActor.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
mDestinationImageActor.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
// Start the masking operation
}
}
+void MaskedImageView::OnControlSizeSet( const Vector3& targetSize )
+{
+ mDestinationImageActor.SetSize(targetSize);
+}
+
void MaskedImageView::OnRenderTaskFinished( Dali::RenderTask& renderTask )
{
Toolkit::MaskedImageView handle( GetOwner() );
*/
virtual ~MaskedImageView();
+ /**
+ *
+ * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
+ */
+ virtual void OnControlSizeSet( const Vector3& targetSize );
+
private:
// Undefined
//Property::Index propertySourcePositionDelayed = mCameraActor.RegisterProperty("delayed-source-position", Vector3::ZERO);
constraint = Constraint::New<Vector3>( Actor::POSITION,
- Source( mSourceActor, Actor::WORLD_POSITION ),
- CameraActorPositionConstraint(stageSize, mDefaultCameraDistance) );
+ Source( mSourceActor, Actor::WORLD_POSITION ),
+ CameraActorPositionConstraint(stageSize, mDefaultCameraDistance) );
mCameraActor.ApplyConstraint(constraint);
// Apply constraint to render-task viewport position
mFrame = ImageActor::New( image );
mFrame.SetDrawMode(DrawMode::OVERLAY);
mFrame.SetStyle( ImageActor::STYLE_NINE_PATCH );
- mFrame.SetPositionInheritanceMode(USE_PARENT_POSITION);
+ mFrame.SetPositionInheritanceMode(DONT_INHERIT_POSITION);
mFrame.SetInheritScale(true);
+ Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
+ ParentSource(Actor::WORLD_POSITION),
+ EqualToConstraint());
+ mFrame.ApplyConstraint( constraint );
+
mFrame.SetNinePatchBorder( Vector4::ONE * IMAGE_BORDER_INDENT );
self.Add(mFrame);
return mBarLayer;
}
-void NavigationControl::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void NavigationControl::OnRelayout( const Vector2& size, ActorSizeContainer& container )
{
const Vector2 setSize( size );
virtual void OnStageConnection();
/**
- * @copydoc Control::OnRelaidOut()
+ * @copydoc Control::OnRelayout()
*/
- virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+ virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
/**
* @copydoc Control::OnControlSizeSet
}
}
-void Popup::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void Popup::OnRelayout( const Vector2& size, ActorSizeContainer& container )
{
// Set the popup size
Vector2 popupSize;
virtual void OnControlChildAdd( Actor& child );
/**
- * @copydoc Control::OnRelaidOut()
+ * @copydoc Control::OnRelayout()
*/
- virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+ virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
/**
* @copydoc Control::OnKeyEvent()
}
}
-void SuperBlurView::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void SuperBlurView::OnRelayout( const Vector2& size, ActorSizeContainer& container )
{
unsigned int numChildren = Self().GetChildCount();
virtual void OnControlSizeSet(const Vector3& targetSize);
/**
- * @copydoc Control::OnRelaidOut()
+ * @copydoc Control::OnRelayout()
*/
- virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+ virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
private:
return mConstraintDuration;
}
-void TableView::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void TableView::OnRelayout( const Vector2& size, ActorSizeContainer& container )
{
float fixedHeightsTotal = 0.0f;
float fixedWidthsTotal = 0.0f;
virtual void OnControlChildRemove(Actor& child);
/**
- * @copydoc Control::OnRelaidOut
+ * @copydoc Control::OnRelayout
*/
- virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+ virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
/**
* @copydoc Control::OnInitialize()
mActiveLayer.SetSize(targetSize);
}
-void TextInput::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void TextInput::OnRelayout( const Vector2& size, ActorSizeContainer& container )
{
Relayout( mDisplayedTextView, size, container );
Relayout( mPopupPanel.GetRootActor(), size, container );
virtual void OnControlSizeSet(const Vector3& targetSize);
/**
- * @copydoc Control::OnRelaidOut()
+ * @copydoc Control::OnRelayout()
*/
- virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+ virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
/**
* Retrieves the text-input's natural size by calling TextView::GetNaturalSize().
}
}
-void TextView::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void TextView::OnRelayout( const Vector2& size, ActorSizeContainer& container )
{
if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) )
{
EllipsizeEnd ///< Ellipsized by the end if it exceeds the width and/or the height.
};
- // Between two OnRelaidOut methods, several calls to InsertTextAt, RemoveTextFrom or SetText can happen.
- // TextViewProcessorMetadata stores the type of operation. A vector stores all operations between two OnRelaidOut calls.
+ // Between two OnRelayout methods, several calls to InsertTextAt, RemoveTextFrom or SetText can happen.
+ // TextViewProcessorMetadata stores the type of operation. A vector stores all operations between two OnRelayout calls.
enum TextViewProcessorMetadataType
{
};
/**
- * Stores info about which data structures need to be modified when the OnRelaidOut() method is called
+ * Stores info about which data structures need to be modified when the OnRelayout() method is called
*/
struct TextViewProcessorMetadata
{
virtual void OnControlSizeSet( const Vector3& size );
/**
- * @copydoc Toolkit::Control::OnRelaidOut()
- *
- * Removes text-actor and calls DoRelayOut()..
+ * @copydoc Toolkit::Control::OnRelayout()
*/
- virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+ virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
/**
* Retrieves the text-view's natural size.
/**
* Process Snapshot. It refresh the render-task in order to generate a new snapshot image.
*
- * ProcessSnapshot is called from OnRelaidOut() only if text has been relaid out.
+ * ProcessSnapshot is called from OnRelayout() only if text has been relaid out.
* It creates a new image buffer only if the size of the text has changed.
*
* @param[in] textViewSize The new text-view's size.
private:
MarkupProcessor::StyledTextArray mCurrentStyledText; ///< text currently displayed by the view
- std::vector<TextViewProcessorMetadata> mTextViewProcessorOperations; ///< Stores all relayout operations which arrive between two consecutive OnRelaidOut() calls.
+ std::vector<TextViewProcessorMetadata> mTextViewProcessorOperations; ///< Stores all relayout operations which arrive between two consecutive OnRelayout() calls.
LayoutParameters mLayoutParameters; ///< Stores some layout parameters in a struct. To be passed in layout functions.
VisualParameters mVisualParameters; ///< Some parameters which afects text-view visualization.
// ToolBar image
background.SetParentOrigin( Dali::ParentOrigin::TOP_CENTER );
background.SetAnchorPoint( Dali::AnchorPoint::TOP_CENTER );
- background.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ background.SetSize( mToolBarSize );
RenderableActor renderableActor = RenderableActor::DownCast( background );
if ( renderableActor )
}
Self().Add( background );
+ mBackground = background;
}
void ToolBar::AddControl( Actor control, float relativeSize, Toolkit::Alignment::Type alignment, const Toolkit::Alignment::Padding& padding )
// actor is in mLayout not in Self().
}
-void ToolBar::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void ToolBar::OnControlSizeSet( const Vector3& targetSize )
{
- Relayout( mLayout, size, container );
+ mToolBarSize = targetSize;
+ mBackground.SetSize( mToolBarSize );
}
} // namespace Internal
virtual void OnControlChildAdd(Actor& child);
/**
- * Called when the tool-bar is relaid out.
- * @param[in] size The size allocated.
- * @param[in/out] container the container to put actors not handled.
+ *
+ * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
*/
- virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+ virtual void OnControlSizeSet( const Vector3& targetSize );
private:
/**
float mRightRelativeSpace; ///< Relative space between center and right groups of controls.
float mAccumulatedRelativeSpace; ///< Stores the total percentage space used by controls.
bool mInitializing; ///< Allows the use of Actor's API to add controls.
+ Vector3 mToolBarSize; ///< The size of tool bar
+ Actor mBackground; ///< The background of the tool bar
std::map<Actor/*control*/,Toolkit::Alignment> mControls; ///< Stores a relationship between controls and their alignments used to place them inside the table view.
};
mBackgroundLayer = Layer::New();
mBackgroundLayer.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
- mBackgroundLayer.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ mBackgroundLayer.SetSize( mViewSize );
// Add background layer to custom actor.
Self().Add( mBackgroundLayer );
}
backgroundImage.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
- Constraint constraint = Constraint::New<Vector3>(
- Actor::SCALE,
- LocalSource( Actor::SIZE ),
- ParentSource( Actor::SIZE ),
- ScaleToFillXYKeepAspectRatioConstraint() );
- backgroundImage.ApplyConstraint( constraint );
+ backgroundImage.SetScale( FillXYKeepAspectRatio( mViewSize, backgroundImage.GetSize() ) );
mBackgroundLayer.Add( backgroundImage );
}
}
}
+void View::OnControlSizeSet( const Vector3& targetSize )
+{
+ mViewSize = targetSize;
+ if( mBackgroundLayer )
+ {
+ mBackgroundLayer.SetSize( mViewSize );
+ if( mBackgroundLayer.GetChildCount() > 0 )
+ {
+ Actor background = mBackgroundLayer.GetChildAt(0);
+ background.SetScale( FillXYKeepAspectRatio( mViewSize, background.GetSize() ) );
+ }
+ }
+}
+
View::Orientation View::DegreeToViewOrientation( Degree degree )
{
View::Orientation orientation = PORTRAIT;
*/
virtual void OnInitialize();
+ /**
+ *
+ * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
+ */
+ virtual void OnControlSizeSet( const Vector3& targetSize );
+
private:
Animation mRotateAnimation; ///< The animation which rotates the view (and all layers added to it)
float mOrientationFunction[4]; ///< The orientation function used to transform from degrees to the internal orientation.
bool mAutoRotateEnabled; ///< Whether the view rotates if the OrientationChanged method is called.
+ Vector3 mViewSize; ///< The Control Size
Toolkit::View::OrientationAnimationStartedSignalType mOrientationAnimationStartedSignal;
};
--- /dev/null
+# Add local source files here
+
+toolkit_src_files = \
+ $(toolkit_src_dir)/builder/builder-actor.cpp \
+ $(toolkit_src_dir)/builder/builder-animations.cpp \
+ $(toolkit_src_dir)/builder/builder-impl.cpp \
+ $(toolkit_src_dir)/builder/builder-set-property.cpp \
+ $(toolkit_src_dir)/builder/builder-signals.cpp \
+ $(toolkit_src_dir)/builder/json-parser-state.cpp \
+ $(toolkit_src_dir)/builder/json-parser-impl.cpp \
+ $(toolkit_src_dir)/builder/tree-node-manipulator.cpp \
+ $(toolkit_src_dir)/builder/replacement.cpp \
+ $(toolkit_src_dir)/controls/alignment/alignment-impl.cpp \
+ $(toolkit_src_dir)/controls/bloom-view/bloom-view-impl.cpp \
+ $(toolkit_src_dir)/controls/bubble-effect/bubble-emitter-impl.cpp \
+ $(toolkit_src_dir)/controls/buttons/button-impl.cpp \
+ $(toolkit_src_dir)/controls/buttons/check-box-button-default-painter-impl.cpp \
+ $(toolkit_src_dir)/controls/buttons/check-box-button-impl.cpp \
+ $(toolkit_src_dir)/controls/buttons/push-button-default-painter-impl.cpp \
+ $(toolkit_src_dir)/controls/buttons/push-button-impl.cpp \
+ $(toolkit_src_dir)/controls/buttons/radio-button-impl.cpp \
+ $(toolkit_src_dir)/controls/cluster/cluster-impl.cpp \
+ $(toolkit_src_dir)/controls/cluster/cluster-style-impl.cpp \
+ $(toolkit_src_dir)/controls/effects-view/effects-view-impl.cpp \
+ $(toolkit_src_dir)/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp \
+ $(toolkit_src_dir)/controls/image-view/masked-image-view-impl.cpp \
+ $(toolkit_src_dir)/controls/magnifier/magnifier-impl.cpp \
+ $(toolkit_src_dir)/controls/navigation-frame/navigation-bar.cpp \
+ $(toolkit_src_dir)/controls/navigation-frame/navigation-control-impl.cpp \
+ $(toolkit_src_dir)/controls/navigation-frame/navigation-title-bar.cpp \
+ $(toolkit_src_dir)/controls/navigation-frame/navigation-tool-bar.cpp \
+ $(toolkit_src_dir)/controls/navigation-frame/page-impl.cpp \
+ $(toolkit_src_dir)/controls/popup/popup-impl.cpp \
+ $(toolkit_src_dir)/controls/popup/popup-style-impl.cpp \
+ $(toolkit_src_dir)/controls/page-turn-view/page-turn-portrait-view-impl.cpp \
+ $(toolkit_src_dir)/controls/page-turn-view/page-turn-landscape-view-impl.cpp \
+ $(toolkit_src_dir)/controls/page-turn-view/page-turn-view-impl.cpp \
+ $(toolkit_src_dir)/controls/relayout-controller-impl.cpp \
+ $(toolkit_src_dir)/controls/relayout-controller.cpp \
+ $(toolkit_src_dir)/controls/relayout-helper.cpp \
+ $(toolkit_src_dir)/controls/scroll-bar/scroll-bar-impl.cpp \
+ $(toolkit_src_dir)/controls/scroll-component/scroll-bar-internal-impl.cpp \
+ $(toolkit_src_dir)/controls/scroll-component/scroll-bar-internal.cpp \
+ $(toolkit_src_dir)/controls/scrollable/bouncing-effect-actor.cpp \
+ $(toolkit_src_dir)/controls/scrollable/item-view/item-view-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scrollable-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-connector-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-base-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/shadow-view/shadow-view-impl.cpp \
+ $(toolkit_src_dir)/controls/slider/slider-impl.cpp \
+ $(toolkit_src_dir)/controls/super-blur-view/super-blur-view-impl.cpp \
+ $(toolkit_src_dir)/controls/table-view/table-view-impl.cpp \
+ $(toolkit_src_dir)/controls/text-input/text-input-decorator-impl.cpp \
+ $(toolkit_src_dir)/controls/text-input/text-input-handles-impl.cpp \
+ $(toolkit_src_dir)/controls/text-input/text-input-impl.cpp \
+ $(toolkit_src_dir)/controls/text-input/text-input-popup-impl.cpp \
+ $(toolkit_src_dir)/controls/text-input/text-input-text-highlight-impl.cpp \
+ $(toolkit_src_dir)/controls/text-view/relayout-utilities.cpp \
+ $(toolkit_src_dir)/controls/text-view/split-by-char-policies.cpp \
+ $(toolkit_src_dir)/controls/text-view/split-by-new-line-char-policies.cpp \
+ $(toolkit_src_dir)/controls/text-view/split-by-word-policies.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-actor-cache.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-processor-bidirectional-info.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-processor.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-view-character-processor.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-view-impl.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-view-paragraph-processor.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-view-processor-dbg.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-view-processor-helper-functions.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-view-processor.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-view-word-processor.cpp \
+ $(toolkit_src_dir)/controls/tool-bar/tool-bar-impl.cpp \
+ $(toolkit_src_dir)/controls/view/view-impl.cpp \
+ $(toolkit_src_dir)/focus-manager/focus-manager-impl.cpp \
+ $(toolkit_src_dir)/focus-manager/keyboard-focus-manager-impl.cpp \
+ $(toolkit_src_dir)/focus-manager/keyinput-focus-manager-impl.cpp \
+ $(toolkit_src_dir)/filters/blur-two-pass-filter.cpp \
+ $(toolkit_src_dir)/filters/emboss-filter.cpp \
+ $(toolkit_src_dir)/filters/image-filter.cpp \
+ $(toolkit_src_dir)/filters/spread-filter.cpp \
+ $(toolkit_src_dir)/shader-effects/page-turn-effect-impl.cpp \
+ $(toolkit_src_dir)/shader-effects/water-effect-impl.cpp \
+ $(toolkit_src_dir)/styling/style-manager-impl.cpp \
+ $(toolkit_src_dir)/transition-effects/cube-transition-effect-impl.cpp \
+ $(toolkit_src_dir)/transition-effects/cube-transition-cross-effect-impl.cpp \
+ $(toolkit_src_dir)/transition-effects/cube-transition-fold-effect-impl.cpp \
+ $(toolkit_src_dir)/transition-effects/cube-transition-wave-effect-impl.cpp
+
/**
* @brief Sets the new alignment. By default ( HorizontalCenter | VerticalCenter ).
- * Note! there should only be one horizontal and one vertical policy
+ *
+ * @note there should only be one horizontal and one vertical policy
* @param [in] type The new alignment option.
*/
void SetAlignmentType( Type type );
return false; // Accessibility value change action is not handled by default
}
-void Control::NegotiateSize( Vector2 allocatedSize, ActorSizeContainer& container )
+void Control::NegotiateSize( const Vector2& allocatedSize, ActorSizeContainer& container )
{
Vector2 size;
allocatedSize.x, allocatedSize.y,
size.x, size.y );
- Relayout( size, container );
+ // Avoids relayout again when OnSizeSet callback arrives as a function of us or deriving class calling SetSize()
+ mImpl->mInsideRelayout = true;
+ Self().SetSize( size );
+ // Only relayout controls which requested to be relaid out.
+ OnRelayout( size, container );
+ mImpl->mInsideRelayout = false;
}
void Control::SetAsKeyboardFocusGroup(bool isFocusGroup)
}
}
-void Control::Relayout( Actor actor, Vector2 size, ActorSizeContainer& container )
+void Control::Relayout( Actor actor, const Vector2& size, ActorSizeContainer& container )
{
if ( actor )
{
{
}
-void Control::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void Control::OnRelayout( const Vector2& size, ActorSizeContainer& container )
{
unsigned int numChildren = Self().GetChildCount();
}
}
-void Control::Relayout(Vector2 size, ActorSizeContainer& container)
-{
- // Avoids relayout again when OnSizeSet callback arrives.
- mImpl->mInsideRelayout = true;
- Self().SetSize( size );
- // @todo this really needs to be at the end of method but not sure why the scope used to be only the SetSize, needs to be cleaned up in size negotiation rework
- mImpl->mInsideRelayout = false;
-
- // Only relayout controls which requested to be relaid out.
- OnRelaidOut( size, container );
-}
-
} // namespace Internal
} // namespace Toolkit
* @brief This method is called during size negotiation when a height is required for a given width.
*
* Derived classes should override this if they wish to customize the height returned.
+ *
+ * @param width to use.
+ * @return the height based on the width.
*/
virtual float GetHeightForWidth( float width );
* @brief This method is called during size negotiation when a width is required for a given height.
*
* Derived classes should override this if they wish to customize the width returned.
+ *
+ * @param height to use.
+ * @return the width based on the width.
*/
virtual float GetWidthForHeight( float height );
* @param[in,out] container The container that holds actors that are fed back into the
* RelayoutController algorithm.
*/
- DALI_INTERNAL void NegotiateSize( Vector2 size, ActorSizeContainer& container );
+ DALI_INTERNAL void NegotiateSize( const Vector2& size, ActorSizeContainer& container );
// Keyboard Focus
// Size Negotiation
/**
- * @brief Sends a request to be relaid-out.
+ * @brief Request a relayout, which means performing a size negotiation on this control, its parent and children (and potentially whole scene)
*
- * This method is called from OnStageConnection(), OnChildAdd(),
- * OnChildRemove(), SetSizePolicy(), SetMinimumSize() and
- * SetMaximumSize().
+ * This method is automatically called from OnStageConnection(), OnChildAdd(),
+ * OnChildRemove(), SetSizePolicy(), SetMinimumSize() and SetMaximumSize().
*
- * This method could also be called from derived classes every time
- * a control's poperty change and it needs to be relaid-out. After
- * the Dali::Stage::SignalMessageQueueFlushed() is emitted a
- * relayout process starts and all controls which called this method
- * will be relaid-out.
+ * This method can also be called from a derived class every time it needs a different size.
+ * At the end of event processing, the relayout process starts and
+ * all controls which requested Relayout will have their sizes (re)negotiated.
*
- * @note RelayoutRequest() only sends a request per Control before
- * the Dali::Stage::SignalMessageQueueFlushed() signal is
- * emitted. That means a control will be relaid-out only once, even
- * if more than one request is sent between two consecutive signals.
+ * @note RelayoutRequest() can be called multiple times; the size negotiation is still
+ * only performed once, i.e. there is no need to keep track of this in the calling side.
*/
void RelayoutRequest();
* @param[in] size The size to allocate to the actor.
* @param[in,out] container The container that holds actors that have not been allocated a size yet.
*/
- static void Relayout( Actor actor, Vector2 size, ActorSizeContainer& container );
+ static void Relayout( Actor actor, const Vector2& size, ActorSizeContainer& container );
private:
virtual void OnControlSizeSet( const Vector3& size );
/**
- * @brief Called after the Dali::Stage::SignalMessageQueueFlushed()
- * signal is emitted if this control requested to be relaid-out.
+ * @brief Called after the size negotiation has been finished for this control.
+ *
+ * The control is expected to assign this given size to itself/its children.
*
* Should be overridden by derived classes if they need to layout
* actors differently after certain operations like add or remove
- * actors, resize or after changing especific properties.
+ * actors, resize or after changing specific properties.
+ *
+ * Note! As this function is called from inside the size negotiation algorithm, you cannot
+ * call RequestRelayout (the call would just be ignored)
*
* @param[in] size The allocated size.
* @param[in,out] container The control should add actors to this container that it is not able
* to allocate a size for.
*/
- virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+ virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
/**
* @brief Called when the control gains key input focus.
*/
DALI_INTERNAL void DoStyleChange( Toolkit::StyleManager styleManager, StyleChange change );
- // Size Negotiation
-
- /**
- * @brief Called by NegotiateSize when the size to allocate to the control has been calculated.
- *
- * It calls the OnRelaidOut() method which can be overridden by derived classes.
- *
- * @param[in] size The allocated size.
- * @param[in,out] container The control should add actors to this container that it is not able
- * to allocate a size for.
- */
- DALI_INTERNAL void Relayout( Vector2 size, ActorSizeContainer& container );
-
private:
// Undefined
const unsigned int TOOLKIT_MAJOR_VERSION = 1;
const unsigned int TOOLKIT_MINOR_VERSION = 0;
-const unsigned int TOOLKIT_MICRO_VERSION = 28;
+const unsigned int TOOLKIT_MICRO_VERSION = 29;
const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED
--- /dev/null
+# Add local source files here
+
+public_api_src_files = \
+ $(public_api_src_dir)/builder/builder.cpp \
+ $(public_api_src_dir)/builder/json-parser.cpp \
+ $(public_api_src_dir)/builder/tree-node.cpp \
+ $(public_api_src_dir)/controls/control-impl.cpp \
+ $(public_api_src_dir)/controls/control.cpp \
+ $(public_api_src_dir)/controls/alignment/alignment.cpp \
+ $(public_api_src_dir)/controls/bubble-effect/bubble-emitter.cpp \
+ $(public_api_src_dir)/controls/buttons/button.cpp \
+ $(public_api_src_dir)/controls/buttons/check-box-button.cpp \
+ $(public_api_src_dir)/controls/buttons/push-button.cpp \
+ $(public_api_src_dir)/controls/buttons/radio-button.cpp \
+ $(public_api_src_dir)/controls/default-controls/check-button-factory.cpp \
+ $(public_api_src_dir)/controls/default-controls/push-button-factory.cpp \
+ $(public_api_src_dir)/controls/default-controls/solid-color-actor.cpp \
+ $(public_api_src_dir)/controls/navigation-frame/navigation-control.cpp \
+ $(public_api_src_dir)/controls/navigation-frame/page.cpp \
+ $(public_api_src_dir)/controls/magnifier/magnifier.cpp \
+ $(public_api_src_dir)/controls/page-turn-view/page-factory.cpp \
+ $(public_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.cpp \
+ $(public_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.cpp \
+ $(public_api_src_dir)/controls/page-turn-view/page-turn-view.cpp \
+ $(public_api_src_dir)/controls/popup/popup.cpp \
+ $(public_api_src_dir)/controls/scroll-bar/scroll-bar.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/depth-layout.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/grid-layout.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/item-factory.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/item-layout.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/item-view.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/navigation-layout.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/roll-layout.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/spiral-layout.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-connector.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-component-impl.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-component.cpp \
+ $(public_api_src_dir)/controls/scrollable/scrollable.cpp \
+ $(public_api_src_dir)/controls/shadow-view/shadow-view.cpp \
+ $(public_api_src_dir)/controls/slider/slider.cpp \
+ $(public_api_src_dir)/controls/super-blur-view/super-blur-view.cpp \
+ $(public_api_src_dir)/controls/table-view/table-view.cpp \
+ $(public_api_src_dir)/controls/text-input/text-input.cpp \
+ $(public_api_src_dir)/controls/text-view/text-view.cpp \
+ $(public_api_src_dir)/controls/tool-bar/tool-bar.cpp \
+ $(public_api_src_dir)/controls/bloom-view/bloom-view.cpp \
+ $(public_api_src_dir)/controls/cluster/cluster-style.cpp \
+ $(public_api_src_dir)/controls/cluster/cluster.cpp \
+ $(public_api_src_dir)/controls/effects-view/effects-view.cpp \
+ $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \
+ $(public_api_src_dir)/controls/image-view/masked-image-view.cpp \
+ $(public_api_src_dir)/controls/view/view.cpp \
+ $(public_api_src_dir)/focus-manager/focus-manager.cpp \
+ $(public_api_src_dir)/focus-manager/keyboard-focus-manager.cpp \
+ $(public_api_src_dir)/focus-manager/keyinput-focus-manager.cpp \
+ $(public_api_src_dir)/markup-processor/markup-processor.cpp \
+ $(public_api_src_dir)/shader-effects/bubble-effect/bubble-effect.cpp \
+ $(public_api_src_dir)/shader-effects/bubble-effect/color-adjuster.cpp \
+ $(public_api_src_dir)/shader-effects/alpha-discard-effect.cpp \
+ $(public_api_src_dir)/shader-effects/bendy-effect.cpp \
+ $(public_api_src_dir)/shader-effects/blind-effect.cpp \
+ $(public_api_src_dir)/shader-effects/bouncing-effect.cpp \
+ $(public_api_src_dir)/shader-effects/carousel-effect.cpp \
+ $(public_api_src_dir)/shader-effects/displacement-effect.cpp \
+ $(public_api_src_dir)/shader-effects/dissolve-effect.cpp \
+ $(public_api_src_dir)/shader-effects/dissolve-local-effect.cpp \
+ $(public_api_src_dir)/shader-effects/distance-field-effect.cpp \
+ $(public_api_src_dir)/shader-effects/image-region-effect.cpp \
+ $(public_api_src_dir)/shader-effects/iris-effect.cpp \
+ $(public_api_src_dir)/shader-effects/mask-effect.cpp \
+ $(public_api_src_dir)/shader-effects/mirror-effect.cpp \
+ $(public_api_src_dir)/shader-effects/motion-blur-effect.cpp \
+ $(public_api_src_dir)/shader-effects/motion-stretch-effect.cpp \
+ $(public_api_src_dir)/shader-effects/nine-patch-mask-effect.cpp \
+ $(public_api_src_dir)/shader-effects/overlay-effect.cpp \
+ $(public_api_src_dir)/shader-effects/page-turn-book-spine-effect.cpp \
+ $(public_api_src_dir)/shader-effects/page-turn-effect.cpp \
+ $(public_api_src_dir)/shader-effects/ripple-effect.cpp \
+ $(public_api_src_dir)/shader-effects/ripple2d-effect.cpp \
+ $(public_api_src_dir)/shader-effects/shear-effect.cpp \
+ $(public_api_src_dir)/shader-effects/soft-button-effect.cpp \
+ $(public_api_src_dir)/shader-effects/spot-effect.cpp \
+ $(public_api_src_dir)/shader-effects/square-dissolve-effect.cpp \
+ $(public_api_src_dir)/shader-effects/swirl-effect.cpp \
+ $(public_api_src_dir)/shader-effects/water-effect.cpp \
+ $(public_api_src_dir)/styling/style-manager.cpp \
+ $(public_api_src_dir)/transition-effects/cube-transition-cross-effect.cpp \
+ $(public_api_src_dir)/transition-effects/cube-transition-effect.cpp \
+ $(public_api_src_dir)/transition-effects/cube-transition-fold-effect.cpp \
+ $(public_api_src_dir)/transition-effects/cube-transition-wave-effect.cpp \
+ $(public_api_src_dir)/dali-toolkit-version.cpp \
+ $(public_api_src_dir)/enums.cpp
+
+# Add public header files here
+
+public_api_header_files = \
+ $(public_api_src_dir)/dali-toolkit-version.h \
+ $(public_api_src_dir)/enums.h
+
+public_api_builder_header_files = \
+ $(public_api_src_dir)/builder/builder.h \
+ $(public_api_src_dir)/builder/json-parser.h \
+ $(public_api_src_dir)/builder/tree-node.h
+
+public_api_controls_header_files = \
+ $(public_api_src_dir)/controls/control-impl.h \
+ $(public_api_src_dir)/controls/control.h
+
+public_api_alignment_header_files = \
+ $(public_api_src_dir)/controls/alignment/alignment.h
+
+public_api_buttons_header_files = \
+ $(public_api_src_dir)/controls/buttons/button.h \
+ $(public_api_src_dir)/controls/buttons/check-box-button.h \
+ $(public_api_src_dir)/controls/buttons/push-button.h \
+ $(public_api_src_dir)/controls/buttons/radio-button.h
+
+public_api_bloom_view_header_files = \
+ $(public_api_src_dir)/controls/bloom-view/bloom-view.h
+
+public_api_bubble_emitter_header_files = \
+ $(public_api_src_dir)/controls/bubble-effect/bubble-emitter.h
+
+public_api_cluster_header_files = \
+ $(public_api_src_dir)/controls/cluster/cluster-style.h \
+ $(public_api_src_dir)/controls/cluster/cluster.h
+
+public_api_default_controls_header_files = \
+ $(public_api_src_dir)/controls/default-controls/check-button-factory.h \
+ $(public_api_src_dir)/controls/default-controls/push-button-factory.h \
+ $(public_api_src_dir)/controls/default-controls/solid-color-actor.h
+
+public_api_effects_view_header_files = \
+ $(public_api_src_dir)/controls/effects-view/effects-view.h
+
+public_api_gaussian_blur_view_header_files = \
+ $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.h
+
+public_api_image_view_header_files = \
+ $(public_api_src_dir)/controls/image-view/masked-image-view.h
+
+public_api_item_view_header_files = \
+ $(public_api_src_dir)/controls/scrollable/item-view/depth-layout.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/grid-layout.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/item-factory.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/item-layout.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/item-view-declarations.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/item-view.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/navigation-layout.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/roll-layout.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/spiral-layout.h
+
+public_api_magnifier_header_files = \
+ $(public_api_src_dir)/controls/magnifier/magnifier.h
+
+public_api_page_turn_view_header_files = \
+ $(public_api_src_dir)/controls/page-turn-view/page-factory.h \
+ $(public_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.h \
+ $(public_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.h \
+ $(public_api_src_dir)/controls/page-turn-view/page-turn-view.h
+
+public_api_popup_header_files = \
+ $(public_api_src_dir)/controls/popup/popup.h
+
+public_api_scrollable_header_files = \
+ $(public_api_src_dir)/controls/scrollable/scroll-component-impl.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-component.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-connector.h \
+ $(public_api_src_dir)/controls/scrollable/scrollable.h
+
+public_api_scroll_bar_header_files = \
+ $(public_api_src_dir)/controls/scroll-bar/scroll-bar.h
+
+public_api_scroll_view_header_files = \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.h
+
+public_api_slider_header_files = \
+ $(public_api_src_dir)/controls/slider/slider.h
+
+public_api_shadow_view_header_files = \
+ $(public_api_src_dir)/controls/shadow-view/shadow-view.h
+
+public_api_super_blur_view_header_files = \
+ $(public_api_src_dir)/controls/super-blur-view/super-blur-view.h
+
+public_api_table_view_header_files = \
+ $(public_api_src_dir)/controls/table-view/table-view.h
+
+public_api_text_input_header_files = \
+ $(public_api_src_dir)/controls/text-input/text-input.h
+
+public_api_text_view_header_files = \
+ $(public_api_src_dir)/controls/text-view/text-view.h
+
+public_api_tool_bar_header_files = \
+ $(public_api_src_dir)/controls/tool-bar/tool-bar.h
+
+public_api_navigation_frame_header_files = \
+ $(public_api_src_dir)/controls/navigation-frame/navigation-bar-style.h \
+ $(public_api_src_dir)/controls/navigation-frame/navigation-control.h \
+ $(public_api_src_dir)/controls/navigation-frame/page.h
+
+public_api_view_header_files = \
+ $(public_api_src_dir)/controls/view/view.h
+
+public_api_focus_manager_header_files = \
+ $(public_api_src_dir)/focus-manager/focus-manager.h \
+ $(public_api_src_dir)/focus-manager/keyboard-focus-manager.h \
+ $(public_api_src_dir)/focus-manager/keyinput-focus-manager.h
+
+public_api_markup_processor_header_files = \
+ $(public_api_src_dir)/markup-processor/markup-processor.h
+
+public_api_shader_effects_header_files = \
+ $(public_api_src_dir)/shader-effects/alpha-discard-effect.h \
+ $(public_api_src_dir)/shader-effects/bendy-effect.h \
+ $(public_api_src_dir)/shader-effects/blind-effect.h \
+ $(public_api_src_dir)/shader-effects/bouncing-effect.h \
+ $(public_api_src_dir)/shader-effects/carousel-effect.h \
+ $(public_api_src_dir)/shader-effects/displacement-effect.h \
+ $(public_api_src_dir)/shader-effects/dissolve-effect.h \
+ $(public_api_src_dir)/shader-effects/dissolve-local-effect.h \
+ $(public_api_src_dir)/shader-effects/distance-field-effect.h \
+ $(public_api_src_dir)/shader-effects/image-region-effect.h \
+ $(public_api_src_dir)/shader-effects/iris-effect.h \
+ $(public_api_src_dir)/shader-effects/mask-effect.h \
+ $(public_api_src_dir)/shader-effects/mirror-effect.h \
+ $(public_api_src_dir)/shader-effects/motion-blur-effect.h \
+ $(public_api_src_dir)/shader-effects/motion-stretch-effect.h \
+ $(public_api_src_dir)/shader-effects/nine-patch-mask-effect.h \
+ $(public_api_src_dir)/shader-effects/overlay-effect.h \
+ $(public_api_src_dir)/shader-effects/page-turn-book-spine-effect.h \
+ $(public_api_src_dir)/shader-effects/page-turn-effect.h \
+ $(public_api_src_dir)/shader-effects/ripple-effect.h \
+ $(public_api_src_dir)/shader-effects/ripple2d-effect.h \
+ $(public_api_src_dir)/shader-effects/shear-effect.h \
+ $(public_api_src_dir)/shader-effects/soft-button-effect.h \
+ $(public_api_src_dir)/shader-effects/spot-effect.h \
+ $(public_api_src_dir)/shader-effects/square-dissolve-effect.h \
+ $(public_api_src_dir)/shader-effects/swirl-effect.h \
+ $(public_api_src_dir)/shader-effects/water-effect.h
+
+public_api_bubble_effect_header_files = \
+ $(public_api_src_dir)/shader-effects/bubble-effect/bubble-effect.h \
+ $(public_api_src_dir)/shader-effects/bubble-effect/color-adjuster.h
+
+public_api_styling_header_files = \
+ $(public_api_src_dir)/styling/style-manager.h
+
+public_api_transition_effects_header_files = \
+ $(public_api_src_dir)/transition-effects/cube-transition-effect.h \
+ $(public_api_src_dir)/transition-effects/cube-transition-cross-effect.h \
+ $(public_api_src_dir)/transition-effects/cube-transition-fold-effect.h \
+ $(public_api_src_dir)/transition-effects/cube-transition-wave-effect.h
+
--- /dev/null
+# Files to install here
+
+dali_toolkit_sound_files =\
+ $(toolkit_sounds_dir)/*.ogg
# Files to install here
dali_toolkit_style_files =\
- $(toolkit_base_styles_dir)/*.json
+ $(toolkit_styles_dir)/*.json
GetHeightForWidth() and GetWidthForHeight() can be created in a similar manner.
@code
-void ControlA::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void ControlA::OnRelayout( const Vector2& size, ActorSizeContainer& container )
{
// Width to be shared between ControlD and ActorD
Vector2 childSize( size.width * 0.5f, size.height );
</tr></table>
@code
-void ControlA::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void ControlA::OnRelayout( const Vector2& size, ActorSizeContainer& container )
{
// Width of children is our size minus border
Vector3 childSize( size.width - mBorder.width * 2.0f,
+++ /dev/null
-# Files to install here
-
-dali_toolkit_optional_image_files =\
- $(toolkit_optional_images_dir)/*.png
+++ /dev/null
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/internal/controls/image-view/image-view-impl.h>
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/animation/constraints.h>
-#include <dali/public-api/object/type-registry.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/shader-effects/distance-field-effect.h>
-
-using namespace Dali;
-
-namespace
-{
-//Type registration
-BaseHandle Create()
-{
- return Toolkit::ImageView::New();
-}
-TypeRegistration mType( typeid(Toolkit::ImageView), typeid(Toolkit::Control), Create );
-
- /**
- * CameraDetailConstraint, generates detail value
- * based on camera's position and ImageView's position.
- */
- struct CameraDetailConstraint
- {
- CameraDetailConstraint(float detailFactor)
- : mDetailFactor(detailFactor)
- {
-
- }
-
- float operator()(const float& current,
- const PropertyInput& propertyTargetPosition,
- const PropertyInput& propertySourcePosition)
- {
- const Vector3& targetPosition = propertyTargetPosition.GetVector3();
- const Vector3& sourcePosition = propertySourcePosition.GetVector3();
- const float distance = (targetPosition - sourcePosition).Length();
- const float detail = mDetailFactor / distance;
-
- return detail;
- }
-
- const float mDetailFactor;
- };
-
-} // unnamed namespace
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// ImageView
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-Dali::Toolkit::ImageView ImageView::New()
-{
- // Create the implementation
- ImageViewPtr imageView(new ImageView());
-
- // Pass ownership to CustomActor via derived handle
- Dali::Toolkit::ImageView handle(*imageView);
-
- // Second-phase init of the implementation
- // This can only be done after the CustomActor connection has been made...
- imageView->Initialize();
-
- return handle;
-}
-
-ImageView::ImageView()
-: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),
- mPropertyDetail( Property::INVALID_INDEX )
-{
-}
-
-void ImageView::Initialize()
-{
- Actor self = Self();
- // Register property that represents the level of detail.
- mPropertyDetail = self.RegisterProperty(Toolkit::ImageView::DETAIL_PROPERTY_NAME, 0.0f);
-
- // Create an empty image actor, filling the entire size of this ImageView.
- Image emptyImage;
- mImageActor = ImageActor::New( emptyImage );
- self.Add( mImageActor );
- mImageActor.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
- mImageActor.SetParentOrigin( ParentOrigin::CENTER );
-}
-
-ImageView::~ImageView()
-{
-
-}
-
-void ImageView::SetImage(const std::string& filename, ImageType type, float min, float max)
-{
- switch(type)
- {
- case Toolkit::ImageView::BitmapType:
- {
- SetImageBitmap(filename, min, max);
- break;
- }
- case Toolkit::ImageView::DistanceFieldType:
- {
- SetImageDistanceField(filename);
- break;
- }
- }
-}
-
-void ImageView::SetImageBitmap(const std::string& filename, float min, float max)
-{
- int minLevel = ceilf(logf(min) / logf(2.0f));
- int maxLevel = ceilf(logf(max) / logf(2.0f));
-
- ImageAttributes attributes;
- const Vector3 size = Self().GetCurrentSize();
-
- if(minLevel==maxLevel)
- { // Single image detail level, no need for any notifications.
- const float detail = powf(2.0f, maxLevel);
- attributes.SetSize( size.x * detail, size.y * detail );
- Image image = Image::New( filename, attributes);
- mImageActor.SetImage( image );
- }
- else
- { // Multi image detail level...
- for( int level = minLevel; level <= maxLevel; level++)
- {
- const float minDetail = powf(2.0f, level - 1);
- const float maxDetail = powf(2.0f, level);
- ImageRequest req(filename, size.x * maxDetail, size.y * maxDetail );
-
- if(level==minLevel)
- {
- AddImage(req, LessThanCondition(maxDetail) );
- }
- else if(level==maxLevel)
- {
- AddImage(req, GreaterThanCondition(minDetail) );
- }
- else
- {
- AddImage(req, InsideCondition(minDetail, maxDetail) );
- }
- }
- }
-}
-
-void ImageView::SetImageDistanceField(const std::string& filename)
-{
- ImageAttributes attributes = Dali::ImageAttributes::NewDistanceField(1.0f, 1);
- const Vector3 size = Self().GetCurrentSize();
-
- attributes.SetSize( size.x, size.y );
- Image image = Image::NewDistanceField(filename, attributes);
- mImageActor.SetImage( image );
-
- DistanceFieldEffect effect = DistanceFieldEffect::New();
- mImageActor.SetShaderEffect( effect );
-}
-
-void ImageView::SetImage(Image image)
-{
- mImageActor.SetImage( image );
-}
-
-void ImageView::AddImage(ImageRequest& req, PropertyCondition condition)
-{
- Actor self = Self();
-
- PropertyNotification notification = self.AddPropertyNotification( mPropertyDetail, condition );
-
- notification.NotifySignal().Connect( this, &ImageView::OnDetailChange );
-
- mNotifications[notification] = req;
-}
-
-void ImageView::SetDetail(float detail)
-{
- Self().SetProperty( mPropertyDetail, detail );
-}
-
-void ImageView::SetCameraActor(CameraActor camera, float detailFactor)
-{
- Constraint constraint = Constraint::New<float>( mPropertyDetail,
- LocalSource( Actor::WORLD_POSITION ),
- Source( camera, Actor::WORLD_POSITION ),
- CameraDetailConstraint(detailFactor));
- Self().RemoveConstraints();
- Self().ApplyConstraint(constraint);
-}
-
-void ImageView::OnDetailChange( PropertyNotification& notification )
-{
- ImageRequest& req = mNotifications[notification];
- Image image = Image::New( req.mFilename, req.mAttributes );
- mImageActor.SetImage( image );
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
+++ /dev/null
-#ifndef __DALI_TOOLKIT_INTERNAL_ImageView_H__
-#define __DALI_TOOLKIT_INTERNAL_ImageView_H__
-
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/actors/image-actor.h>
-#include <dali/public-api/common/map-wrapper.h>
-#include <dali/public-api/images/image-attributes.h>
-#include <dali/public-api/object/property-notification.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/image-view/image-view.h>
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-
-class ImageView;
-
-typedef IntrusivePtr<ImageView> ImageViewPtr;
-
-/**
- * @copydoc Toolkit::ImageView
- */
-class ImageView : public Control
-{
-public:
-
- typedef Toolkit::ImageView::ImageType ImageType;
-
- /**
- * ImageRequest element
- * represents an image to be loaded and displayed
- * with given attributes.
- */
- struct ImageRequest
- {
- /**
- * Default constructor
- */
- ImageRequest()
- {
- }
-
- /**
- * @param[in] filename to load
- * @param[in] width Width of image.
- * @param[in] height Height of image.
- */
- ImageRequest( const std::string& filename, unsigned int width, unsigned int height )
- : mFilename( filename )
- {
- mAttributes.SetSize( width, height );
- }
-
- std::string mFilename; ///< filename of image
- ImageAttributes mAttributes; ///< attributes of image
- };
-
-public:
-
- /**
- * Create a new ImageView.
- * @return A public handle to the newly allocated ImageView.
- */
- static Dali::Toolkit::ImageView New();
-
-public:
-
- /**
- * @copydoc Toolkit::ImageView::SetImage(const std::string& filename, ImageType type, float min, float max)
- */
- void SetImage(const std::string& filename, ImageType type, float min, float max);
-
- /**
- * @copydoc Toolkit::ImageView::SetImage(Image& image);
- */
- void SetImage(Image image);
-
- /**
- * Adds an image to displayed at a detail range.
- *
- * @note If two or more images are specified to be displayed at
- * the same overlapping range. Then the last image that was added
- * will be displayed.
- *
- * @param[in] req The image to load and display
- * @param[in] condition The detail condition to be satisified for the image to display
- */
- void AddImage(ImageRequest& req, PropertyCondition condition);
-
- /**
- * @copydoc Toolkit::ImageView::SetCameraActor
- */
- void SetCameraActor(CameraActor camera, float detailFactor);
-
- /**
- * @copydoc Toolkit::ImageView::SetDetail
- */
- void SetDetail(float detail);
-
-protected:
-
- /**
- * Construct a new ImageView.
- */
- ImageView();
-
- /**
- * 2nd-phase initialization.
- */
- void Initialize();
-
- /**
- * A reference counted object may only be deleted by calling Unreference()
- */
- virtual ~ImageView();
-
-private:
-
- /**
- * Sets a Bitmap Image as the image to display for this ImageView
- * min and max represent the minimum and maximum sizes to load.
- * sizes will be created at 2^n scale factor. where n goes from
- * ceil(log2(min)) to ceil(log2(max))
- *
- * @param[in] filename the image path to load
- * @param[in] min the minimum size to load
- * @param[in] max the maximum size to load
- */
- void SetImageBitmap(const std::string& filename, float min, float max);
-
- /**
- * Sets a Distance Field Image as the image to display for this ImageView
- *
- * @param[in] filename the image path to load
- */
- void SetImageDistanceField(const std::string& filename);
-
- /**
- * Invoked whenever the detail property passes a notification point.
- * @param[in] notification The notification instance.
- */
- virtual void OnDetailChange(PropertyNotification& notification );
-
-private:
-
- // Undefined
- ImageView(const ImageView&);
-
- // Undefined
- ImageView& operator=(const ImageView& rhs);
-
-private:
-
- Property::Index mPropertyDetail; ///< Detail property, changing this affects the level of detail of the content.
- ImageActor mImageActor; ///< Holding image actor for the various images at differing levels of detail.
- std::map<PropertyNotification, ImageRequest> mNotifications; ///< Property Notification -> Image map table.
-
- PropertyNotification mPropertyNotification; ///< Property notification
-};
-
-} // namespace Internal
-
-// Helpers for public-api forwarding methods
-
-inline Toolkit::Internal::ImageView& GetImpl(Toolkit::ImageView& pub)
-{
- DALI_ASSERT_ALWAYS(pub);
-
- Dali::RefObject& handle = pub.GetImplementation();
-
- return static_cast<Toolkit::Internal::ImageView&>(handle);
-}
-
-inline const Toolkit::Internal::ImageView& GetImpl(const Toolkit::ImageView& pub)
-{
- DALI_ASSERT_ALWAYS(pub);
-
- const Dali::RefObject& handle = pub.GetImplementation();
-
- return static_cast<const Toolkit::Internal::ImageView&>(handle);
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_TOOLKIT_INTERNAL_ImageView_H__
+++ /dev/null
-# Add local source files here
-
-toolkit_optional_src_files = \
- $(toolkit_optional_src_dir)/controls/bloom-view/bloom-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/cluster/cluster-impl.cpp \
- $(toolkit_optional_src_dir)/controls/cluster/cluster-style-impl.cpp \
- $(toolkit_optional_src_dir)/controls/effects-view/effects-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/image-view/image-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/image-view/masked-image-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/page-turn-view/page-turn-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/page-turn-view/page-turn-portrait-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/page-turn-view/page-turn-landscape-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/shadow-view/shadow-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/slider/slider-impl.cpp \
- $(toolkit_optional_src_dir)/controls/super-blur-view/super-blur-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/bubble-effect/bubble-emitter-impl.cpp \
- $(toolkit_optional_src_dir)/controls/tool-bar/tool-bar-impl.cpp \
- $(toolkit_optional_src_dir)/controls/view/view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-control-impl.cpp \
- $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-bar.cpp \
- $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-tool-bar.cpp \
- $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-title-bar.cpp \
- $(toolkit_optional_src_dir)/controls/navigation-frame/page-impl.cpp \
- $(toolkit_optional_src_dir)/filters/blur-two-pass-filter.cpp \
- $(toolkit_optional_src_dir)/filters/emboss-filter.cpp \
- $(toolkit_optional_src_dir)/filters/image-filter.cpp \
- $(toolkit_optional_src_dir)/filters/spread-filter.cpp \
- $(toolkit_optional_src_dir)/shader-effects/water-effect-impl.cpp \
- $(toolkit_optional_src_dir)/shader-effects/page-turn-effect-impl.cpp \
- $(toolkit_optional_src_dir)/transition-effects/cube-transition-effect-impl.cpp \
- $(toolkit_optional_src_dir)/transition-effects/cube-transition-wave-effect-impl.cpp \
- $(toolkit_optional_src_dir)/transition-effects/cube-transition-cross-effect-impl.cpp \
- $(toolkit_optional_src_dir)/transition-effects/cube-transition-fold-effect-impl.cpp \
- $(toolkit_optional_src_dir)/controls/magnifier/magnifier-impl.cpp
+++ /dev/null
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/internal/controls/image-view/image-view-impl.h>
-#include <dali-toolkit/public-api/controls/buttons/button.h>
-
-using namespace Dali;
-
-namespace
-{
-const float DEFAULT_MINIMUM_DETAIL = 0.125f; ///< Default Minimum Detail level 12.5% of original size.
-const float DEFAULT_MAXIMUM_DETAIL = 1.0f; ///< Default Maximum Detail level 100% (original size)
-const float CAMERA_100_PCT_DISTANCE(1695.0f); ///< Based on Camera/Viewport/Projection settings at this distance object is 100% size.
-} // unnamed namespace
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// ImageView
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-const std::string ImageView::DETAIL_PROPERTY_NAME( "image-view-detail" );
-
-ImageView::ImageView()
-{
-}
-
-ImageView::ImageView( const ImageView& handle )
-: Control( handle )
-{
-}
-
-ImageView& ImageView::operator=( const ImageView& handle )
-{
- if( &handle != this )
- {
- Control::operator=( handle );
- }
- return *this;
-}
-
-ImageView::ImageView(Internal::ImageView& implementation)
-: Control(implementation)
-{
-}
-
-ImageView::ImageView( Dali::Internal::CustomActor* internal )
-: Control( internal )
-{
- VerifyCustomActorPointer<Internal::ImageView>(internal);
-}
-
-ImageView ImageView::New()
-{
- return Internal::ImageView::New();
-}
-
-ImageView ImageView::DownCast( BaseHandle handle )
-{
- return Control::DownCast<ImageView, Internal::ImageView>( handle );
-}
-
-ImageView::~ImageView()
-{
-}
-
-void ImageView::SetImage(const std::string& filename, ImageType type)
-{
- GetImpl(*this).SetImage( filename, type, DEFAULT_MINIMUM_DETAIL, DEFAULT_MAXIMUM_DETAIL );
-}
-
-void ImageView::SetImage(const std::string& filename, ImageType type, float min, float max)
-{
- GetImpl(*this).SetImage( filename, type, min, max );
-}
-
-void ImageView::SetImage(Image image)
-{
- GetImpl(*this).SetImage( image );
-}
-
-void ImageView::SetCameraActor(CameraActor camera)
-{
- // TODO: Default detail factor should be calculated based on
- // current Camera's field of view/viewport/projection.
- // Ideal place would be inside the constraint, and have the Camera
- // settings as properties.
- GetImpl(*this).SetCameraActor( camera, CAMERA_100_PCT_DISTANCE );
-}
-
-void ImageView::SetCameraActor(CameraActor camera, float detailFactor)
-{
- GetImpl(*this).SetCameraActor( camera, detailFactor );
-}
-
-void ImageView::SetDetail(float detail)
-{
- GetImpl(*this).SetDetail( detail );
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
+++ /dev/null
-#ifndef __DALI_TOOLKIT_IMAGE_VIEW_H__
-#define __DALI_TOOLKIT_IMAGE_VIEW_H__
-
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/actors/camera-actor.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control.h>
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal DALI_INTERNAL
-{
-class ImageView;
-}
-
-class Button;
-
-/**
- * ImageView control loads and displays the correct
- * image for the current level of detail (LOD) required.
- * LOD is typically calculated from the Camera distance.
- *
- * Example:
- *
- * ImageView imageView = ImageView::New();
- * imageView.SetCameraActor( mCamera );
- * imageView.SetSize( Vector2(64.0f, 64.0f) );
- * imageView.SetImage( "my-image.png", ImageView::BitmapType, 0.125f, 4.0f );
- * layer.Add(imageView);
- *
- * The above creates an ImageView at 64x64 in size. Images of 12.5% the size up
- * to 400% the size of imageView are created
- * i.e. 8x8, 16x16, 32x32, 64x64, 128x128, and 256x256
- *
- * based on the distance imageView is from mCamera an appropriate, different
- * image will be loaded and dispayed.
- */
-class DALI_IMPORT_API ImageView : public Control
-{
-public:
-
- /**
- * Image Types, determines how image should be rendered.
- */
- enum ImageType
- {
- BitmapType, ///< Standard Bitmap image
- DistanceFieldType ///< Distance Field encoded image
- };
-
- static const std::string DETAIL_PROPERTY_NAME; ///< The level of detail property
-
-public:
-
- /**
- * Creates an empty ImageView handle
- */
- ImageView();
-
- /**
- * Copy constructor. Creates another handle that points to the same real object
- * @param handle to copy from
- */
- ImageView( const ImageView& handle );
-
- /**
- * Assignment operator. Changes this handle to point to another real object
- */
- ImageView& operator=( const ImageView& handle );
-
- /**
- * @brief Destructor
- *
- * This is non-virtual since derived Handle types must not contain data or virtual methods.
- */
- ~ImageView();
-
- /**
- * Create the Poup control
- * @return A handle to the ImageView control.
- */
- static ImageView New();
-
- /**
- * Downcast an Object handle to ImageView. If handle points to an ImageView the
- * downcast produces valid handle. If not the returned handle is left uninitialized.
- * @param[in] handle Handle to an object
- * @return handle to a ImageView or an uninitialized handle
- */
- static ImageView DownCast( BaseHandle handle );
-
-public:
-
- /**
- * Load image into ImageView for level of detail scaling.
- * Will automatically create different sized versions
- * of the source image.
- *
- * @param[in] filename The image path to load
- * @param[in] type The type of image e.g. BitmapType or DistanceFieldType
- */
- void SetImage(const std::string& filename, ImageType type);
-
- /**
- * Load image into ImageView for level of detail scaling.
- * The minimum scale is a percentage of the size of the
- * image view, and represents the smallest version of the
- * source image to display e.g. 0.125 for 12.5%
- * While the maximum scale represents the largest version of
- * the source image to display e.g. 1.00 for 100% (original
- * image view size)
- *
- * @note ImageView SetSize must be set specified prior to
- * calling this.
- *
- * @param[in] filename The image path to load
- * @param[in] type The type of image e.g. BitmapImage or DistanceFieldImage
- * @param[in] min The minimum scale detail to load.
- * @param[in] max The maximum scale detail to load.
- */
- void SetImage(const std::string& filename, ImageType type, float min, float max);
-
- /**
- * Sets an image to displayed for the entire detail range.
- * Regardless of the detail level this image will be displayed.
- *
- * @param[in] image The image to display
- */
- void SetImage(Image image);
-
- /**
- * Sets the camera to use for determining level of detail.
- * Which is based on distance from camera to this ImageView.
- * The detailFactor is the distance at which the ImageView
- * should appear at 100% scale. Which may differ based on
- * Projection, and ShaderEffect settings.
- * @param[in] camera The camera
- */
- void SetCameraActor(CameraActor camera);
-
- /**
- * Sets the camera to use for determining level of detail.
- * Which is based on distance from camera to this ImageView.
- * The detailFactor is the distance at which the ImageView
- * should appear at 100% scale. Which may differ based on
- * Projection, and ShaderEffect settings.
- * @param[in] camera The camera
- * @param[in] detailFactor The Camera distance where detail should be 1.0
- * (ImageView should appear at 100% scale)
- */
- void SetCameraActor(CameraActor camera, float detailFactor);
-
- /**
- * Sets the current detail level.
- * @note This sets the detail property value.
- * @param[in] detail The level of detail to be viewed at.
- */
- void SetDetail(float detail);
-
-public: // Not intended for application developers
-
- /**
- * Creates a handle using the Toolkit::Internal implementation.
- * @param[in] implementation The Control implementation.
- */
- DALI_INTERNAL ImageView(Internal::ImageView& implementation);
-
- /**
- * Allows the creation of this Control from an Internal::CustomActor pointer.
- * @param[in] internal A pointer to the internal CustomActor.
- */
- explicit DALI_INTERNAL ImageView(Dali::Internal::CustomActor* internal);
-};
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_TOOLKIT_IMAGE_VIEW_H__
+++ /dev/null
-# Add local source files here
-
-public_api_optional_src_files = \
- $(public_api_optional_src_dir)/controls/bloom-view/bloom-view.cpp \
- $(public_api_optional_src_dir)/controls/cluster/cluster.cpp \
- $(public_api_optional_src_dir)/controls/cluster/cluster-style.cpp \
- $(public_api_optional_src_dir)/controls/effects-view/effects-view.cpp \
- $(public_api_optional_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \
- $(public_api_optional_src_dir)/controls/image-view/image-view.cpp \
- $(public_api_optional_src_dir)/controls/image-view/masked-image-view.cpp \
- $(public_api_optional_src_dir)/controls/magnifier/magnifier.cpp \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-view.cpp \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-factory.cpp \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-portrait-view.cpp \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-landscape-view.cpp \
- $(public_api_optional_src_dir)/controls/shadow-view/shadow-view.cpp \
- $(public_api_optional_src_dir)/controls/slider/slider.cpp \
- $(public_api_optional_src_dir)/controls/super-blur-view/super-blur-view.cpp \
- $(public_api_optional_src_dir)/controls/tool-bar/tool-bar.cpp \
- $(public_api_optional_src_dir)/controls/view/view.cpp \
- $(public_api_optional_src_dir)/controls/navigation-frame/navigation-control.cpp \
- $(public_api_optional_src_dir)/controls/navigation-frame/page.cpp \
- $(public_api_optional_src_dir)/controls/bubble-effect/bubble-emitter.cpp \
- $(public_api_optional_src_dir)/shader-effects/alpha-discard-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/bendy-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/blind-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/carousel-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/displacement-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/dissolve-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/dissolve-local-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/distance-field-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/iris-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/mask-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/mirror-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/motion-blur-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/motion-stretch-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/nine-patch-mask-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/overlay-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/page-turn-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/page-turn-book-spine-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/ripple-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/ripple2d-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/shear-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/soft-button-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/spot-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/square-dissolve-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/swirl-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/water-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/bubble-effect/bubble-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/bubble-effect/color-adjuster.cpp \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-effect.cpp \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-wave-effect.cpp \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-cross-effect.cpp \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-fold-effect.cpp \
- $(public_api_optional_src_dir)/dali-toolkit-version.cpp
-
-# Add public header files here
-
-public_api_optional_header_files = \
- $(public_api_optional_src_dir)/dali-toolkit-version.h
-
-public_api_optional_controls_header_files =
-
-public_api_optional_bubble_emitter_header_files = \
- $(public_api_optional_src_dir)/controls/bubble-effect/bubble-emitter.h
-
-public_api_optional_bloom_view_header_files = \
- $(public_api_optional_src_dir)/controls/bloom-view/bloom-view.h
-
-public_api_optional_cluster_header_files = \
- $(public_api_optional_src_dir)/controls/cluster/cluster.h \
- $(public_api_optional_src_dir)/controls/cluster/cluster-style.h
-
-public_api_optional_effects_view_header_files = \
- $(public_api_optional_src_dir)/controls/effects-view/effects-view.h
-
-public_api_optional_gaussian_blur_view_header_files = \
- $(public_api_optional_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.h
-
-public_api_optional_image_view_header_files = \
- $(public_api_optional_src_dir)/controls/image-view/image-view.h \
- $(public_api_optional_src_dir)/controls/image-view/masked-image-view.h
-
-public_api_optional_magnifier_header_files = \
- $(public_api_optional_src_dir)/controls/magnifier/magnifier.h
-
-public_api_optional_page_turn_view_header_files = \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-view.h \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-factory.h \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-portrait-view.h \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-landscape-view.h
-
-public_api_optional_slider_header_files = \
- $(public_api_optional_src_dir)/controls/slider/slider.h
-
-public_api_optional_shadow_view_header_files = \
- $(public_api_optional_src_dir)/controls/shadow-view/shadow-view.h
-
-public_api_optional_super_blur_view_header_files = \
- $(public_api_optional_src_dir)/controls/super-blur-view/super-blur-view.h
-
-public_api_optional_tool_bar_header_files = \
- $(public_api_optional_src_dir)/controls/tool-bar/tool-bar.h
-
-public_api_optional_view_header_files = \
- $(public_api_optional_src_dir)/controls/view/view.h
-
-public_api_optional_navigation_frame_header_files = \
- $(public_api_optional_src_dir)/controls/navigation-frame/navigation-control.h \
- $(public_api_optional_src_dir)/controls/navigation-frame/page.h \
- $(public_api_optional_src_dir)/controls/navigation-frame/navigation-bar-style.h
-
-public_api_optional_markup_processor_header_files =
-
-public_api_optional_shader_effects_header_files = \
- $(public_api_optional_src_dir)/shader-effects/alpha-discard-effect.h \
- $(public_api_optional_src_dir)/shader-effects/bendy-effect.h \
- $(public_api_optional_src_dir)/shader-effects/blind-effect.h \
- $(public_api_optional_src_dir)/shader-effects/carousel-effect.h \
- $(public_api_optional_src_dir)/shader-effects/displacement-effect.h \
- $(public_api_optional_src_dir)/shader-effects/dissolve-local-effect.h \
- $(public_api_optional_src_dir)/shader-effects/distance-field-effect.h \
- $(public_api_optional_src_dir)/shader-effects/mirror-effect.h \
- $(public_api_optional_src_dir)/shader-effects/motion-blur-effect.h \
- $(public_api_optional_src_dir)/shader-effects/motion-stretch-effect.h \
- $(public_api_optional_src_dir)/shader-effects/overlay-effect.h \
- $(public_api_optional_src_dir)/shader-effects/shear-effect.h \
- $(public_api_optional_src_dir)/shader-effects/soft-button-effect.h \
- $(public_api_optional_src_dir)/shader-effects/spot-effect.h \
- $(public_api_optional_src_dir)/shader-effects/square-dissolve-effect.h \
- $(public_api_optional_src_dir)/shader-effects/water-effect.h
-
-public_api_optional_bubble_effect_header_files = \
- $(public_api_optional_src_dir)/shader-effects/bubble-effect/bubble-effect.h \
- $(public_api_optional_src_dir)/shader-effects/bubble-effect/color-adjuster.h
-
-public_api_optional_transition_effects_header_files = \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-effect.h \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-wave-effect.h \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-cross-effect.h \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-fold-effect.h
-
Name: dali-toolkit
Summary: The OpenGLES Canvas Core Library Toolkit
-Version: 1.0.28
+Version: 1.0.29
Release: 1
Group: System/Libraries
License: Apache-2.0
projects / platform / core / uifw / dali-toolkit.git / commitdiff
