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
{
public:
// PushButton Pressed
- typedef SignalV2< bool ( Button ) > PressedSignalV2;
+ typedef Signal< bool ( Button ) > PressedSignalType;
- PressedSignalV2& PressedSignal();
+ PressedSignalType& PressedSignal();
/**
* Default constructor.
/**
* @return the pressed signal.
*/
- Toolkit::TETButton::PressedSignalV2& PressedSignal();
+ Toolkit::TETButton::PressedSignalType& PressedSignal();
/**
* Callback called when an interrupt events is received.
*/
void OnButtonDown();
- Toolkit::TETButton::PressedSignalV2 mPressedSignal; ///< Signal emitted when the button is pressed.
+ Toolkit::TETButton::PressedSignalType mPressedSignal; ///< Signal emitted when the button is pressed.
};
} // namespace Internal
return Control::DownCast<TETButton, Internal::TETButton>(handle);
}
-TETButton::PressedSignalV2& TETButton::PressedSignal()
+TETButton::PressedSignalType& TETButton::PressedSignal()
{
TETButton button( *this );
DALI_ASSERT_ALWAYS( button );
return tetButton;
}
-Toolkit::TETButton::PressedSignalV2& TETButton::PressedSignal()
+Toolkit::TETButton::PressedSignalType& TETButton::PressedSignal()
{
return mPressedSignal;
}
PushButton button = PushButton::New();
Stage::GetCurrent().Add( button );
- // PushButton::PROPERTY_AUTO_REPEATING
+ // Button::PROPERTY_AUTO_REPEATING
button.SetAutoRepeating( false );
- DALI_TEST_CHECK( ! button.GetProperty< bool >( PushButton::PROPERTY_AUTO_REPEATING ) );
- button.SetProperty( PushButton::PROPERTY_AUTO_REPEATING, true );
+ DALI_TEST_CHECK( ! button.GetProperty< bool >( Button::PROPERTY_AUTO_REPEATING ) );
+ button.SetProperty( Button::PROPERTY_AUTO_REPEATING, true );
DALI_TEST_CHECK( button.IsAutoRepeating() ) ;
- DALI_TEST_CHECK( button.GetProperty< bool >( PushButton::PROPERTY_AUTO_REPEATING ) );
+ DALI_TEST_CHECK( button.GetProperty< bool >( Button::PROPERTY_AUTO_REPEATING ) );
- // PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY
+ // Button::PROPERTY_INITIAL_AUTO_REPEATING_DELAY
button.SetInitialAutoRepeatingDelay( 10.0f );
- DALI_TEST_EQUALS( 10.0f, button.GetProperty< float >( PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY ), TEST_LOCATION );
- button.SetProperty( PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY, 25.0f );
+ DALI_TEST_EQUALS( 10.0f, button.GetProperty< float >( Button::PROPERTY_INITIAL_AUTO_REPEATING_DELAY ), TEST_LOCATION );
+ button.SetProperty( Button::PROPERTY_INITIAL_AUTO_REPEATING_DELAY, 25.0f );
DALI_TEST_EQUALS( 25.0f, button.GetInitialAutoRepeatingDelay(), TEST_LOCATION );
- DALI_TEST_EQUALS( 25.0f, button.GetProperty< float >( PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY ), TEST_LOCATION );
+ DALI_TEST_EQUALS( 25.0f, button.GetProperty< float >( Button::PROPERTY_INITIAL_AUTO_REPEATING_DELAY ), TEST_LOCATION );
- // PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY
+ // Button::PROPERTY_NEXT_AUTO_REPEATING_DELAY
button.SetNextAutoRepeatingDelay( 3.0f );
- DALI_TEST_EQUALS( 3.0f, button.GetProperty< float >( PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY ), TEST_LOCATION );
- button.SetProperty( PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY, 4.0f );
+ DALI_TEST_EQUALS( 3.0f, button.GetProperty< float >( Button::PROPERTY_NEXT_AUTO_REPEATING_DELAY ), TEST_LOCATION );
+ button.SetProperty( Button::PROPERTY_NEXT_AUTO_REPEATING_DELAY, 4.0f );
DALI_TEST_EQUALS( 4.0f, button.GetNextAutoRepeatingDelay(), TEST_LOCATION );
- DALI_TEST_EQUALS( 4.0f, button.GetProperty< float >( PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY ), TEST_LOCATION );
+ DALI_TEST_EQUALS( 4.0f, button.GetProperty< float >( Button::PROPERTY_NEXT_AUTO_REPEATING_DELAY ), TEST_LOCATION );
- // PushButton::PROPERTY_TOGGLABLE
+ // Button::PROPERTY_TOGGLABLE
button.SetToggleButton( false );
- DALI_TEST_CHECK( ! button.GetProperty< bool >( PushButton::PROPERTY_TOGGLABLE ) );
- button.SetProperty( PushButton::PROPERTY_TOGGLABLE, true );
+ DALI_TEST_CHECK( ! button.GetProperty< bool >( Button::PROPERTY_TOGGLABLE ) );
+ button.SetProperty( Button::PROPERTY_TOGGLABLE, true );
DALI_TEST_CHECK( button.IsToggleButton() ) ;
- DALI_TEST_CHECK( button.GetProperty< bool >( PushButton::PROPERTY_TOGGLABLE ) );
+ DALI_TEST_CHECK( button.GetProperty< bool >( Button::PROPERTY_TOGGLABLE ) );
- // PushButton::PROPERTY_TOGGLE
+ // Button::PROPERTY_TOGGLED
button.SetToggled( false );
- DALI_TEST_CHECK( ! button.GetProperty< bool >( PushButton::PROPERTY_TOGGLE ) );
- button.SetProperty( PushButton::PROPERTY_TOGGLE, true );
+ DALI_TEST_CHECK( ! button.GetProperty< bool >( Button::PROPERTY_TOGGLED ) );
+ button.SetProperty( Button::PROPERTY_TOGGLED, true );
DALI_TEST_CHECK( button.IsToggled() ) ;
- DALI_TEST_CHECK( button.GetProperty< bool >( PushButton::PROPERTY_TOGGLE ) );
+ DALI_TEST_CHECK( button.GetProperty< bool >( Button::PROPERTY_TOGGLED ) );
- // PushButton::PROPERTY_NORMAL_STATE_ACTOR
+ // Button::PROPERTY_NORMAL_STATE_ACTOR
{
button.SetButtonImage( Image::New( "IMAGE_PATH_1") );
- DALI_TEST_EQUALS( "IMAGE_PATH_1", button.GetProperty( PushButton::PROPERTY_NORMAL_STATE_ACTOR ).GetValue( "image" ).GetValue( "filename" ).Get< std::string >(), TEST_LOCATION );
+ DALI_TEST_EQUALS( "IMAGE_PATH_1", button.GetProperty( Button::PROPERTY_NORMAL_STATE_ACTOR ).GetValue( "image" ).GetValue( "filename" ).Get< std::string >(), TEST_LOCATION );
Property::Map map;
map[ "type" ] = "ImageActor";
- button.SetProperty( PushButton::PROPERTY_NORMAL_STATE_ACTOR, map );
- DALI_TEST_EQUALS( "ImageActor", button.GetProperty( PushButton::PROPERTY_NORMAL_STATE_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION );
+ button.SetProperty( Button::PROPERTY_NORMAL_STATE_ACTOR, map );
+ DALI_TEST_EQUALS( "ImageActor", button.GetProperty( Button::PROPERTY_NORMAL_STATE_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION );
}
- // PushButton::PROPERTY_PRESSED_IMAGE
+ // Button::PROPERTY_SELECTED_STATE_ACTOR
{
- button.SetPressedImage( Image::New( "IMAGE_PATH_2") );
- DALI_TEST_EQUALS( "IMAGE_PATH_2", button.GetProperty( PushButton::PROPERTY_PRESSED_STATE_ACTOR ).GetValue( "image" ).GetValue( "filename" ).Get< std::string >(), TEST_LOCATION );
+ button.SetSelectedImage( Image::New( "IMAGE_PATH_2") );
+ DALI_TEST_EQUALS( "IMAGE_PATH_2", button.GetProperty( Button::PROPERTY_SELECTED_STATE_ACTOR ).GetValue( "image" ).GetValue( "filename" ).Get< std::string >(), TEST_LOCATION );
Property::Map map;
map[ "type" ] = "Actor";
- button.SetProperty( PushButton::PROPERTY_PRESSED_STATE_ACTOR, map );
- DALI_TEST_EQUALS( "Actor", button.GetProperty( PushButton::PROPERTY_PRESSED_STATE_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION );
- DALI_TEST_CHECK( "ImageActor" != button.GetProperty( PushButton::PROPERTY_PRESSED_STATE_ACTOR ).GetValue( "type" ).Get< std::string >() );
+ button.SetProperty( Button::PROPERTY_SELECTED_STATE_ACTOR, map );
+ DALI_TEST_EQUALS( "Actor", button.GetProperty( Button::PROPERTY_SELECTED_STATE_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION );
+ DALI_TEST_CHECK( "ImageActor" != button.GetProperty( Button::PROPERTY_SELECTED_STATE_ACTOR ).GetValue( "type" ).Get< std::string >() );
}
- // PushButton::PROPERTY_DIMMED_STATE_ACTOR
+ // Button::PROPERTY_DISABLED_STATE_ACTOR
{
- button.SetDimmedImage( Image::New( "IMAGE_PATH_3") );
- DALI_TEST_EQUALS( "IMAGE_PATH_3", button.GetProperty( PushButton::PROPERTY_DIMMED_STATE_ACTOR ).GetValue( "image" ).GetValue( "filename" ).Get< std::string >(), TEST_LOCATION );
+ button.SetDisabledImage( Image::New( "IMAGE_PATH_3") );
+ DALI_TEST_EQUALS( "IMAGE_PATH_3", button.GetProperty( Button::PROPERTY_DISABLED_STATE_ACTOR ).GetValue( "image" ).GetValue( "filename" ).Get< std::string >(), TEST_LOCATION );
Property::Map map;
map[ "type" ] = "Actor";
- button.SetProperty( PushButton::PROPERTY_DIMMED_STATE_ACTOR, map );
- DALI_TEST_EQUALS( "Actor", button.GetProperty( PushButton::PROPERTY_DIMMED_STATE_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION );
+ button.SetProperty( Button::PROPERTY_DISABLED_STATE_ACTOR, map );
+ DALI_TEST_EQUALS( "Actor", button.GetProperty( Button::PROPERTY_DISABLED_STATE_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION );
}
- // PushButton::PROPERTY_LABEL_ACTOR
+ // Button::PROPERTY_LABEL_ACTOR
{
- button.SetLabelText( "LABEL_TEXT_CUSTOM" );
- DALI_TEST_EQUALS( "TextView", button.GetProperty( PushButton::PROPERTY_LABEL_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION );
+ button.SetLabel( "LABEL_TEXT_CUSTOM" );
+ DALI_TEST_EQUALS( "TextView", button.GetProperty( Button::PROPERTY_LABEL_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION );
Property::Map map;
map[ "type" ] = "Actor";
- button.SetProperty( PushButton::PROPERTY_LABEL_ACTOR, map );
- DALI_TEST_EQUALS( "Actor", button.GetProperty( PushButton::PROPERTY_LABEL_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION );
+ button.SetProperty( Button::PROPERTY_LABEL_ACTOR, map );
+ DALI_TEST_EQUALS( "Actor", button.GetProperty( Button::PROPERTY_LABEL_ACTOR ).GetValue( "type" ).Get< std::string >(), TEST_LOCATION );
}
END_TEST;
}
+++ /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-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("dimmed"), false );
- DALI_TEST_CHECK( false == checkBoxButton.IsDimmed() );
-
- checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("dimmed"), true );
- DALI_TEST_CHECK( true == checkBoxButton.IsDimmed() );
- END_TEST;
-}
-
-int UtcDaliButtonSetGetDimmed(void)
-{
- ToolkitTestApplication application;
- tet_infoline(" UtcDaliButtonSetGetDimmed");
-
- CheckBoxButton checkBoxButton = CheckBoxButton::New();
- checkBoxButton.SetDimmed( true );
-
- DALI_TEST_CHECK( checkBoxButton.IsDimmed() );
- checkBoxButton.SetDimmed( false );
-
- DALI_TEST_CHECK( !checkBoxButton.IsDimmed() );
- checkBoxButton.SetDimmed( true );
-
- DALI_TEST_CHECK( checkBoxButton.IsDimmed() );
- checkBoxButton.SetDimmed( false );
-
- DALI_TEST_CHECK( !checkBoxButton.IsDimmed() );
- 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;
-}
# 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
)
public: // Signals
- Dali::AccessibilityManager::AccessibilityActionSignalV2& StatusChangedSignal();
- Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionNextSignal();
- Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionPreviousSignal();
- Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionActivateSignal();
- Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionReadSignal();
- Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionReadNextSignal();
- Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionReadPreviousSignal();
- Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionOverSignal();
- Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionUpSignal();
- Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionDownSignal();
- Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionClearFocusSignal();
- Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionBackSignal();
- Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionControlPanelOpenSignal();
+ Dali::AccessibilityManager::AccessibilityActionSignalType& StatusChangedSignal();
+ Dali::AccessibilityManager::AccessibilityActionSignalType& ActionNextSignal();
+ Dali::AccessibilityManager::AccessibilityActionSignalType& ActionPreviousSignal();
+ Dali::AccessibilityManager::AccessibilityActionSignalType& ActionActivateSignal();
+ Dali::AccessibilityManager::AccessibilityActionSignalType& ActionReadSignal();
+ Dali::AccessibilityManager::AccessibilityActionSignalType& ActionReadNextSignal();
+ Dali::AccessibilityManager::AccessibilityActionSignalType& ActionReadPreviousSignal();
+ Dali::AccessibilityManager::AccessibilityActionSignalType& ActionOverSignal();
+ Dali::AccessibilityManager::AccessibilityActionSignalType& ActionUpSignal();
+ Dali::AccessibilityManager::AccessibilityActionSignalType& ActionDownSignal();
+ Dali::AccessibilityManager::AccessibilityActionSignalType& ActionClearFocusSignal();
+ Dali::AccessibilityManager::AccessibilityActionSignalType& ActionBackSignal();
+ Dali::AccessibilityManager::AccessibilityActionSignalType& ActionControlPanelOpenSignal();
private:
- Dali::AccessibilityManager::AccessibilityActionSignalV2 mStatusChangedSignal;
- Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionNextSignal;
- Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionPreviousSignal;
- Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionActivateSignal;
- Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionReadSignal;
- Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionReadNextSignal;
- Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionReadPreviousSignal;
- Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionOverSignal;
- Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionUpSignal;
- Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionDownSignal;
- Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionClearFocusSignal;
- Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionBackSignal;
- Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionControlPanelOpenSignal;
+ Dali::AccessibilityManager::AccessibilityActionSignalType mStatusChangedSignal;
+ Dali::AccessibilityManager::AccessibilityActionSignalType mActionNextSignal;
+ Dali::AccessibilityManager::AccessibilityActionSignalType mActionPreviousSignal;
+ Dali::AccessibilityManager::AccessibilityActionSignalType mActionActivateSignal;
+ Dali::AccessibilityManager::AccessibilityActionSignalType mActionReadSignal;
+ Dali::AccessibilityManager::AccessibilityActionSignalType mActionReadNextSignal;
+ Dali::AccessibilityManager::AccessibilityActionSignalType mActionReadPreviousSignal;
+ Dali::AccessibilityManager::AccessibilityActionSignalType mActionOverSignal;
+ Dali::AccessibilityManager::AccessibilityActionSignalType mActionUpSignal;
+ Dali::AccessibilityManager::AccessibilityActionSignalType mActionDownSignal;
+ Dali::AccessibilityManager::AccessibilityActionSignalType mActionClearFocusSignal;
+ Dali::AccessibilityManager::AccessibilityActionSignalType mActionBackSignal;
+ Dali::AccessibilityManager::AccessibilityActionSignalType mActionControlPanelOpenSignal;
bool mIsEnabled;
Dali::AccessibilityActionHandler* mActionHandler;
mGestureHandler = &handler;
}
-Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::StatusChangedSignal()
+Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::StatusChangedSignal()
{
return mStatusChangedSignal;
}
-Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionNextSignal()
+Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionNextSignal()
{
return mActionNextSignal;
}
-Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionPreviousSignal()
+Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionPreviousSignal()
{
return mActionPreviousSignal;
}
-Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionActivateSignal()
+Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionActivateSignal()
{
return mActionActivateSignal;
}
-Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadSignal()
+Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadSignal()
{
return mActionReadSignal;
}
-Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadNextSignal()
+Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadNextSignal()
{
return mActionReadNextSignal;
}
-Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadPreviousSignal()
+Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadPreviousSignal()
{
return mActionReadPreviousSignal;
}
-Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionOverSignal()
+Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionOverSignal()
{
return mActionOverSignal;
}
-Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionUpSignal()
+Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionUpSignal()
{
return mActionUpSignal;
}
-Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionDownSignal()
+Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionDownSignal()
{
return mActionDownSignal;
}
-Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionClearFocusSignal()
+Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionClearFocusSignal()
{
return mActionClearFocusSignal;
}
-Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionBackSignal()
+Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionBackSignal()
{
return mActionBackSignal;
}
-Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionControlPanelOpenSignal()
+Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionControlPanelOpenSignal()
{
return mActionControlPanelOpenSignal;
}
//Internal::Adaptor::GetImplementation(*this).HandleActionDisableEvent();
}
-AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::StatusChangedSignal()
+AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::StatusChangedSignal()
{
return Internal::Adaptor::GetImplementation(*this).StatusChangedSignal();
}
-AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionNextSignal()
+AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionNextSignal()
{
return Internal::Adaptor::GetImplementation(*this).ActionNextSignal();
}
-AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionPreviousSignal()
+AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionPreviousSignal()
{
return Internal::Adaptor::GetImplementation(*this).ActionPreviousSignal();
}
-AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionActivateSignal()
+AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionActivateSignal()
{
return Internal::Adaptor::GetImplementation(*this).ActionActivateSignal();
}
-AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionOverSignal()
+AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionOverSignal()
{
return Internal::Adaptor::GetImplementation(*this).ActionOverSignal();
}
-AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadSignal()
+AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadSignal()
{
return Internal::Adaptor::GetImplementation(*this).ActionReadSignal();
}
-AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadNextSignal()
+AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadNextSignal()
{
return Internal::Adaptor::GetImplementation(*this).ActionReadNextSignal();
}
-AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadPreviousSignal()
+AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadPreviousSignal()
{
return Internal::Adaptor::GetImplementation(*this).ActionReadPreviousSignal();
}
-AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionUpSignal()
+AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionUpSignal()
{
return Internal::Adaptor::GetImplementation(*this).ActionUpSignal();
}
-AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionDownSignal()
+AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionDownSignal()
{
return Internal::Adaptor::GetImplementation(*this).ActionDownSignal();
}
-AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionClearFocusSignal()
+AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionClearFocusSignal()
{
return Internal::Adaptor::GetImplementation(*this).ActionClearFocusSignal();
}
-AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionBackSignal()
+AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionBackSignal()
{
return Internal::Adaptor::GetImplementation(*this).ActionBackSignal();
}
#include <string>
#include <boost/function.hpp>
#include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
#include <dali/public-api/events/touch-point.h>
namespace Dali
class AccessibilityManager : public BaseHandle
{
public: // Typedefs
- typedef SignalV2< bool ( AccessibilityManager& ) > AccessibilityActionSignalV2;
+ typedef Signal< bool ( AccessibilityManager& ) > AccessibilityActionSignalType;
public: // Construction & Destruction
AccessibilityManager();
void HandleActionDisableEvent();
public: // Signals
- AccessibilityActionSignalV2& StatusChangedSignal();
- AccessibilityActionSignalV2& ActionNextSignal();
- AccessibilityActionSignalV2& ActionPreviousSignal();
- AccessibilityActionSignalV2& ActionActivateSignal();
- AccessibilityActionSignalV2& ActionReadSignal();
- AccessibilityActionSignalV2& ActionOverSignal();
- AccessibilityActionSignalV2& ActionReadNextSignal();
- AccessibilityActionSignalV2& ActionReadPreviousSignal();
- AccessibilityActionSignalV2& ActionUpSignal();
- AccessibilityActionSignalV2& ActionDownSignal();
- AccessibilityActionSignalV2& ActionClearFocusSignal();
- AccessibilityActionSignalV2& ActionBackSignal();
+ AccessibilityActionSignalType& StatusChangedSignal();
+ AccessibilityActionSignalType& ActionNextSignal();
+ AccessibilityActionSignalType& ActionPreviousSignal();
+ AccessibilityActionSignalType& ActionActivateSignal();
+ AccessibilityActionSignalType& ActionReadSignal();
+ AccessibilityActionSignalType& ActionOverSignal();
+ AccessibilityActionSignalType& ActionReadNextSignal();
+ AccessibilityActionSignalType& ActionReadPreviousSignal();
+ AccessibilityActionSignalType& ActionUpSignal();
+ AccessibilityActionSignalType& ActionDownSignal();
+ AccessibilityActionSignalType& ActionClearFocusSignal();
+ AccessibilityActionSignalType& ActionBackSignal();
AccessibilityManager( Internal::Adaptor::AccessibilityManager* manager );
};
#include <boost/any.hpp>
#include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
#include <dali/public-api/adaptor-framework/orientation.h>
namespace Dali
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/object/base-object.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
namespace Dali
{
{
public:
- typedef Dali::ClipboardEventNotifier::ClipboardEventSignalV2 ClipboardEventSignalV2;
+ typedef Dali::ClipboardEventNotifier::ClipboardEventSignalType ClipboardEventSignalType;
// Creation
static Dali::ClipboardEventNotifier New();
void EmitContentSelectedSignal();
// Signals
- ClipboardEventSignalV2& ContentSelectedSignal()
+ ClipboardEventSignalType& ContentSelectedSignal()
{
- return mContentSelectedSignalV2;
+ return mContentSelectedSignal;
}
private:
private:
std::string mContent; ///< The current selected content.
- ClipboardEventSignalV2 mContentSelectedSignalV2;
+ ClipboardEventSignalType mContentSelectedSignal;
static Dali::ClipboardEventNotifier mToolkitClipboardEventNotifier;
void ClipboardEventNotifier::EmitContentSelectedSignal()
{
- if ( !mContentSelectedSignalV2.Empty() )
+ if ( !mContentSelectedSignal.Empty() )
{
Dali::ClipboardEventNotifier handle( this );
- mContentSelectedSignalV2.Emit( handle );
+ mContentSelectedSignal.Emit( handle );
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-const char* const ClipboardEventNotifier::SIGNAL_CONTENT_SELECTED( "content-selected" );
-
ClipboardEventNotifier::ClipboardEventNotifier()
{
}
Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).EmitContentSelectedSignal();
}
-ClipboardEventNotifier::ClipboardEventSignalV2& ClipboardEventNotifier::ContentSelectedSignal()
+ClipboardEventNotifier::ClipboardEventSignalType& ClipboardEventNotifier::ContentSelectedSignal()
{
return Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).ContentSelectedSignal();
}
// PUBLIC INCLUDES
#define __DALI_CLIPBOARD_EVENT_NOTIFIER_H__
#include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
namespace Dali
class ClipboardEventNotifier : public BaseHandle
{
public:
- typedef SignalV2< void ( ClipboardEventNotifier& ) > ClipboardEventSignalV2;
- static const char* const SIGNAL_CONTENT_SELECTED; ///< name "content-selected"
+ typedef Signal< void ( ClipboardEventNotifier& ) > ClipboardEventSignalType;
ClipboardEventNotifier();
static ClipboardEventNotifier Get();
void ClearContent();
void EmitContentSelectedSignal();
- ClipboardEventSignalV2& ContentSelectedSignal();
+ ClipboardEventSignalType& ContentSelectedSignal();
ClipboardEventNotifier( Internal::Adaptor::ClipboardEventNotifier* notifier );
};
class ImfManager : public Dali::BaseObject
{
public:
- typedef Dali::ImfManager::ImfManagerSignalV2 ImfManagerSignalV2;
- typedef Dali::ImfManager::ImfEventSignalV2 ImfEventSignalV2;
+ typedef Dali::ImfManager::ImfManagerSignalType ImfManagerSignalType;
+ typedef Dali::ImfManager::ImfEventSignalType ImfEventSignalType;
public:
static Dali::ImfManager Get();
std::string GetSurroundingText();
public: // Signals
- ImfManagerSignalV2& ActivatedSignal() { return mActivatedSignalV2; }
- ImfEventSignalV2& EventReceivedSignal() { return mEventSignalV2; }
+ ImfManagerSignalType& ActivatedSignal() { return mActivatedSignal; }
+ ImfEventSignalType& EventReceivedSignal() { return mEventSignal; }
protected:
virtual ~ImfManager();
bool mIdleCallbackConnected:1; ///< Whether the idle callback is already connected.
std::vector<Dali::Integration::KeyEvent> mKeyEvents; ///< Stores key events to be sent from idle call-back.
- ImfManagerSignalV2 mActivatedSignalV2;
- ImfEventSignalV2 mEventSignalV2;
+ ImfManagerSignalType mActivatedSignal;
+ ImfEventSignalType mEventSignal;
static Dali::ImfManager mToolkitImfManager;
return Internal::Adaptor::ImfManager::GetImplementation(*this).GetSurroundingText();
}
-ImfManager::ImfManagerSignalV2& ImfManager::ActivatedSignal()
+ImfManager::ImfManagerSignalType& ImfManager::ActivatedSignal()
{
return Internal::Adaptor::ImfManager::GetImplementation(*this).ActivatedSignal();
}
-ImfManager::ImfEventSignalV2& ImfManager::EventReceivedSignal()
+ImfManager::ImfEventSignalType& ImfManager::EventReceivedSignal()
{
return Internal::Adaptor::ImfManager::GetImplementation(*this).EventReceivedSignal();
}
// EXTERNAL INCLUDES
#define __DALI_IMF_MANAGER_H__
#include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
namespace Dali DALI_IMPORT_API
{
bool preeditResetRequired; // flag if preedit reset is required.
};
- typedef SignalV2< void (ImfManager&) > ImfManagerSignalV2;
+ typedef Signal< void (ImfManager&) > ImfManagerSignalType;
- typedef SignalV2< ImfCallbackData ( ImfManager&, const ImfEventData& ) > ImfEventSignalV2;
+ typedef Signal< ImfCallbackData ( ImfManager&, const ImfEventData& ) > ImfEventSignalType;
public:
* This is emitted when the virtual keyboard is connected to or the hardware keyboard is activated.
* @return The IMF Activated signal.
*/
- ImfManagerSignalV2& ActivatedSignal();
+ ImfManagerSignalType& ActivatedSignal();
/**
* This is emitted when the IMF manager receives an event from the IMF
* @return The Event signal containing the event data.
*/
- ImfEventSignalV2& EventReceivedSignal();
+ ImfEventSignalType& EventReceivedSignal();
// Construction & Destruction
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/object/base-object.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
namespace Dali
{
public: // Signals
- Dali::Orientation::OrientationSignalV2& ChangedSignal();
+ Dali::Orientation::OrientationSignalType& ChangedSignal();
void EmitChangedSignal()
{
private:
- Dali::Orientation::OrientationSignalV2 mChangedSignal;
+ Dali::Orientation::OrientationSignalType mChangedSignal;
ToolkitOrientation* mToolkitOrientation;
return Math::PI * (float)mOrientation / 180.0f;
}
-Dali::Orientation::OrientationSignalV2& Orientation::ChangedSignal()
+Dali::Orientation::OrientationSignalType& Orientation::ChangedSignal()
{
mToolkitOrientation->mFunctionsCalled.ChangedSignal = true;
return mChangedSignal;
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/object/base-object.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
namespace Dali
{
bool IsAttached() const;
public: // Signals
- Dali::PhysicalKeyboard::Signal& StatusChangedSignal();
+ Dali::PhysicalKeyboard::PhysicalKeyboardSignalType& StatusChangedSignal();
private:
- Dali::PhysicalKeyboard::Signal mStatusChangedSignal;
+ Dali::PhysicalKeyboard::PhysicalKeyboardSignalType mStatusChangedSignal;
bool mIsAttached;
static Dali::PhysicalKeyboard mPhysicalKeyboard;
};
return mIsAttached;
}
-Dali::PhysicalKeyboard::Signal& PhysicalKeyboard::StatusChangedSignal()
+Dali::PhysicalKeyboard::PhysicalKeyboardSignalType& PhysicalKeyboard::StatusChangedSignal()
{
return mStatusChangedSignal;
}
return pyke.IsAttached();
}
-PhysicalKeyboard::Signal& PhysicalKeyboard::StatusChangedSignal()
+PhysicalKeyboard::PhysicalKeyboardSignalType& PhysicalKeyboard::StatusChangedSignal()
{
BaseObject& object = GetBaseObject();
Internal::Adaptor::PhysicalKeyboard& pyke = static_cast< Internal::Adaptor::PhysicalKeyboard& >( object );
// EXTERNAL INCLUDES
#include <string>
#include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
namespace Dali
{
class PhysicalKeyboard : public BaseHandle
{
public:
- typedef SignalV2< void (PhysicalKeyboard) > Signal;
+ typedef Signal< void (PhysicalKeyboard) > PhysicalKeyboardSignalType;
PhysicalKeyboard();
~PhysicalKeyboard();
static PhysicalKeyboard Get();
bool IsAttached() const;
- Signal& StatusChangedSignal();
+ PhysicalKeyboardSignalType& StatusChangedSignal();
PhysicalKeyboard( Internal::Adaptor::PhysicalKeyboard* impl );
};
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/common/map-wrapper.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
namespace Dali
{
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/object/base-object.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
namespace Dali
{
void SetTheme(std::string theme);
public: // Signals
- Dali::StyleMonitor::StyleChangeSignalV2& StyleChangeSignal();
+ Dali::StyleMonitor::StyleChangeSignalType& StyleChangeSignal();
void EmitStyleChangeSignal(StyleChange styleChange)
{
}
private:
- Dali::StyleMonitor::StyleChangeSignalV2 mStyleChangeSignal;
+ Dali::StyleMonitor::StyleChangeSignalType mStyleChangeSignal;
static Dali::StyleMonitor mToolkitStyleMonitor;
std::string mTheme;
};
EmitStyleChangeSignal(styleChange);
}
-Dali::StyleMonitor::StyleChangeSignalV2& StyleMonitor::StyleChangeSignal()
+Dali::StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal()
{
return mStyleChangeSignal;
}
GetImplementation(*this).SetTheme(themeFilePath);
}
-StyleMonitor::StyleChangeSignalV2& StyleMonitor::StyleChangeSignal()
+StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal()
{
return GetImplementation(*this).StyleChangeSignal();
}
// INTERNAL INCLUDES
#define __DALI_STYLE_MONITOR_H__
#include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
#include <dali/public-api/adaptor-framework/style-change.h>
namespace Dali
class StyleMonitor : public BaseHandle
{
public: // Typedefs
- typedef SignalV2< void (StyleMonitor, StyleChange) > StyleChangeSignalV2;
+ typedef Signal< void (StyleMonitor, StyleChange) > StyleChangeSignalType;
static const std::string DEFAULT_FONT_FAMILY;
static const float DEFAULT_FONT_SIZE;
void SetTheme(std::string themeFilePath);
public: // Signals
- StyleChangeSignalV2& StyleChangeSignal();
+ StyleChangeSignalType& StyleChangeSignal();
void EmitStyleChangeSignal(StyleChange handle);
public: // Operators
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/object/base-object.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
namespace Dali
{
public: // Signals
- Dali::Timer::TimerSignalV2& TickSignal();
+ Dali::Timer::TimerSignalType& TickSignal();
private: // Implementation
private: // Data
- Dali::Timer::TimerSignalV2 mTickSignal;
+ Dali::Timer::TimerSignalType mTickSignal;
unsigned int mInterval;
};
return false;
}
-Dali::Timer::TimerSignalV2& Timer::TickSignal()
+Dali::Timer::TimerSignalType& Timer::TickSignal()
{
return mTickSignal;
}
return true;
}
-Timer::TimerSignalV2& Timer::TickSignal()
+Timer::TimerSignalType& Timer::TickSignal()
{
return Internal::Adaptor::GetImplementation( *this ).TickSignal();
}
// PUBLIC INCLUDES
#define __DALI_TIMER_H__
#include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
namespace Dali
{
class Timer : public BaseHandle
{
public:
- typedef SignalV2< bool () > TimerSignalV2;
+ typedef Signal< bool () > TimerSignalType;
Timer();
static Timer New( unsigned int milliSec );
Timer( const Timer& timer );
void SetInterval( unsigned int milliSec );
unsigned int GetInterval() const;
bool IsRunning() const;
- TimerSignalV2& TickSignal();
+ TimerSignalType& TickSignal();
private:
Timer(Internal::Adaptor::Timer* timer);
};
PushButton pushButton = PushButton::New();
- pushButton.SetProperty(pushButton.GetPropertyIndex("dimmed"), false);
- DALI_TEST_CHECK( false == pushButton.IsDimmed() );
- pushButton.SetProperty(pushButton.GetPropertyIndex("dimmed"), true);
- DALI_TEST_CHECK( true == pushButton.IsDimmed() );
+ pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), false);
+ DALI_TEST_CHECK( false == pushButton.IsDisabled() );
+ pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), true);
+ DALI_TEST_CHECK( true == pushButton.IsDisabled() );
END_TEST;
}
PushButton pushButton = PushButton::New();
- pushButton.SetDimmed( true );
+ pushButton.SetDisabled( true );
- DALI_TEST_CHECK( pushButton.IsDimmed() );
+ DALI_TEST_CHECK( pushButton.IsDisabled() );
- pushButton.SetDimmed( false );
+ pushButton.SetDisabled( false );
- DALI_TEST_CHECK( !pushButton.IsDimmed() );
+ DALI_TEST_CHECK( !pushButton.IsDisabled() );
- pushButton.SetDimmed( true );
+ pushButton.SetDisabled( true );
- DALI_TEST_CHECK( pushButton.IsDimmed() );
+ DALI_TEST_CHECK( pushButton.IsDisabled() );
- pushButton.SetDimmed( false );
+ pushButton.SetDisabled( false );
- DALI_TEST_CHECK( !pushButton.IsDimmed() );
+ DALI_TEST_CHECK( !pushButton.IsDisabled() );
END_TEST;
}
tet_infoline(" UtcDaliCheckBoxButtonSetGetChecked");
CheckBoxButton checkBoxButton = CheckBoxButton::New();
- checkBoxButton.ToggledSignal().Connect( &CheckBoxButtonClicked );
+ checkBoxButton.StateChangedSignal().Connect( &CheckBoxButtonClicked );
// global var used to check if CheckBoxButtonClicked is called;
gCheckBoxButtonState = false;
DALI_TEST_EQUALS( size.width, 40.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 40.f, TEST_LOCATION );
- checkBoxButton.SetDimmedBackgroundImage( image03 );
+ checkBoxButton.SetDisabledBackgroundImage( image03 );
application.SendNotification();
application.Render();
- size = checkBoxButton.GetDimmedBackgroundImage().GetCurrentSize();
+ size = checkBoxButton.GetDisabledBackgroundImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 50.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 50.f, TEST_LOCATION );
- checkBoxButton.SetDimmedBackgroundImage( imageActor03 );
+ checkBoxButton.SetDisabledBackgroundImage( imageActor03 );
application.SendNotification();
application.Render();
- size = checkBoxButton.GetDimmedBackgroundImage().GetCurrentSize();
+ size = checkBoxButton.GetDisabledBackgroundImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 60.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 60.f, TEST_LOCATION );
- checkBoxButton.SetDimmedCheckedImage( image04 );
+ checkBoxButton.SetDisabledCheckedImage( image04 );
application.SendNotification();
application.Render();
- size = checkBoxButton.GetDimmedCheckedImage().GetCurrentSize();
+ size = checkBoxButton.GetDisabledCheckedImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 70.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 70.f, TEST_LOCATION );
- checkBoxButton.SetDimmedCheckedImage( imageActor04 );
+ checkBoxButton.SetDisabledCheckedImage( imageActor04 );
application.SendNotification();
application.Render();
- size = checkBoxButton.GetDimmedCheckedImage().GetCurrentSize();
+ size = checkBoxButton.GetDisabledCheckedImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 80.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 80.f, TEST_LOCATION );
}
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;
+}
PushButton pushButton = PushButton::New();
pushButton.SetToggleButton( true );
- pushButton.ToggledSignal().Connect( &PushButtonToggled );
+ pushButton.StateChangedSignal().Connect( &PushButtonToggled );
gPushButtonToggleState = false;
pushButton.SetToggled( true );
PushButton pushButton = PushButton::New();
pushButton.SetToggleButton( false );
- pushButton.ToggledSignal().Connect( &PushButtonToggled );
+ pushButton.StateChangedSignal().Connect( &PushButtonToggled );
gPushButtonToggleState = false;
pushButton.SetToggled( true );
DALI_TEST_EQUALS( size.width, 40.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 40.f, TEST_LOCATION );
- pushButton.SetPressedImage( image03 );
+ pushButton.SetSelectedImage( image03 );
application.SendNotification();
application.Render();
- size = pushButton.GetPressedImage().GetCurrentSize();
+ size = pushButton.GetSelectedImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 50.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 50.f, TEST_LOCATION );
- pushButton.SetPressedImage( imageActor03 );
+ pushButton.SetSelectedImage( imageActor03 );
application.SendNotification();
application.Render();
- size = pushButton.GetPressedImage().GetCurrentSize();
+ size = pushButton.GetSelectedImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 60.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 60.f, TEST_LOCATION );
- pushButton.SetDimmedBackgroundImage( image04 );
+ pushButton.SetDisabledBackgroundImage( image04 );
application.SendNotification();
application.Render();
- size = pushButton.GetDimmedBackgroundImage().GetCurrentSize();
+ size = pushButton.GetDisabledBackgroundImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 70.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 70.f, TEST_LOCATION );
- pushButton.SetDimmedBackgroundImage( imageActor04 );
+ pushButton.SetDisabledBackgroundImage( imageActor04 );
application.SendNotification();
application.Render();
- size = pushButton.GetDimmedBackgroundImage().GetCurrentSize();
+ size = pushButton.GetDisabledBackgroundImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 80.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 80.f, TEST_LOCATION );
- pushButton.SetDimmedImage( image05 );
+ pushButton.SetDisabledImage( image05 );
application.SendNotification();
application.Render();
- size = pushButton.GetDimmedImage().GetCurrentSize();
+ size = pushButton.GetDisabledImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 90.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 90.f, TEST_LOCATION );
- pushButton.SetDimmedImage( imageActor05 );
+ pushButton.SetDisabledImage( imageActor05 );
application.SendNotification();
application.Render();
- size = pushButton.GetDimmedImage().GetCurrentSize();
+ size = pushButton.GetDisabledImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 100.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 100.f, TEST_LOCATION );
application.SendNotification();
application.Render();
- pushButton.SetLabelText( STR );
+ pushButton.SetLabel( STR );
END_TEST;
}
application.Render();
// connect to its touch signal
- pushButton.ToggledSignal().Connect( &PushButtonToggled );
+ pushButton.StateChangedSignal().Connect( &PushButtonToggled );
Dali::Integration::TouchEvent event;
RadioButton radioButton = RadioButton::New();
// Default active
- DALI_TEST_CHECK( radioButton.IsActive() == false );
+ DALI_TEST_CHECK( radioButton.IsSelected() == false );
// False to true
radioButton.ToggleState();
- DALI_TEST_CHECK( radioButton.IsActive() == true );
+ DALI_TEST_CHECK( radioButton.IsSelected() == true );
// True to false
radioButton.ToggleState();
- DALI_TEST_CHECK( radioButton.IsActive() == false );
+ DALI_TEST_CHECK( radioButton.IsSelected() == false );
// False
- radioButton.SetActive( false );
- DALI_TEST_CHECK( radioButton.IsActive() == false );
+ radioButton.SetSelected( false );
+ DALI_TEST_CHECK( radioButton.IsSelected() == false );
// True
- radioButton.SetActive( true );
- DALI_TEST_CHECK( radioButton.IsActive() == true );
+ radioButton.SetSelected( true );
+ DALI_TEST_CHECK( radioButton.IsSelected() == true );
// False
- radioButton.SetActive( false );
- DALI_TEST_CHECK( radioButton.IsActive() == false );
+ radioButton.SetSelected( false );
+ DALI_TEST_CHECK( radioButton.IsSelected() == false );
END_TEST;
}
radioButton.SetPosition( 0.0f, 0.0f );
// Default active
- DALI_TEST_CHECK( radioButton.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
+ DALI_TEST_CHECK( radioButton.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
// Setting false active
- radioButton.SetProperty( RadioButton::PROPERTY_ACTIVE, false );
- DALI_TEST_CHECK( radioButton.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
+ radioButton.SetProperty( Button::PROPERTY_TOGGLED, false );
+ DALI_TEST_CHECK( radioButton.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
// Setting true active
- radioButton.SetProperty( RadioButton::PROPERTY_ACTIVE, true );
- DALI_TEST_CHECK( radioButton.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == true );
+ radioButton.SetProperty( Button::PROPERTY_TOGGLED, true );
+ DALI_TEST_CHECK( radioButton.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == true );
// Setting false again
- radioButton.SetProperty( RadioButton::PROPERTY_ACTIVE, false );
- DALI_TEST_CHECK( radioButton.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
+ radioButton.SetProperty( Button::PROPERTY_TOGGLED, false );
+ DALI_TEST_CHECK( radioButton.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
// Test selecting radio buttons
RadioButton radioButton2 = RadioButton::New( "label" );
application.Render();
// Simulate touch events
- DALI_TEST_CHECK( radioButton2.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
- DALI_TEST_CHECK( radioButton3.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
+ DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
+ DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
// Select first radio
{
application.SendNotification();
application.Render();
- DALI_TEST_CHECK( radioButton2.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == true );
- DALI_TEST_CHECK( radioButton3.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
+ DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == true );
+ DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
}
// Select an already selected radio
application.SendNotification();
application.Render();
- DALI_TEST_CHECK( radioButton2.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == true );
- DALI_TEST_CHECK( radioButton3.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
+ DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == true );
+ DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
}
// Select second radio
application.SendNotification();
application.Render();
- DALI_TEST_CHECK( radioButton2.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
- DALI_TEST_CHECK( radioButton3.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == true );
+ DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
+ DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == true );
}
// Select outside radio group
application.SendNotification();
application.Render();
- DALI_TEST_CHECK( radioButton2.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
- DALI_TEST_CHECK( radioButton3.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == true );
+ DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
+ DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == true );
}
END_TEST;
} // unnamed namespace
-int UtcDaliScrollViewCustomEffectSetup(void)
-{
- tet_infoline(" UtcDaliScrollViewCustomEffectSetup");
-
- ScrollViewCustomEffect effect;
-
- DALI_TEST_CHECK( !effect );
-
- BaseHandle handle = ScrollViewCustomEffect::New();
-
- DALI_TEST_CHECK( handle );
-
- effect = ScrollViewCustomEffect::DownCast(handle);
-
- DALI_TEST_CHECK( effect );
-
- END_TEST;
-}
-
int UtcDaliScrollViewCubeEffectSetup(void)
{
tet_infoline(" UtcDaliScrollViewCubeEffectSetup");
END_TEST;
}
-
-
-
-int UtcDaliScrollViewSlideEffectSetup(void)
-{
- tet_infoline(" UtcDaliScrollViewSlideEffectSetup");
-
- ScrollViewSlideEffect effect;
-
- DALI_TEST_CHECK( !effect );
-
- BaseHandle handle = ScrollViewSlideEffect::New();
-
- DALI_TEST_CHECK( handle );
-
- effect = ScrollViewSlideEffect::DownCast(handle);
-
- DALI_TEST_CHECK( effect );
- END_TEST;
-}
-
int UtcDaliScrollViewCubeEffectTest(void)
{
ToolkitTestApplication application;
END_TEST;
}
+int UtcDaliScrollViewPageCubeEffectSetup(void)
+{
+ tet_infoline(" UtcDaliScrollViewPageCubeEffectSetup");
+ ScrollViewPageCubeEffect effect;
+
+ DALI_TEST_CHECK( !effect );
-int UtcDaliScrollViewSlideEffectTest(void)
+ BaseHandle handle = ScrollViewPageCubeEffect::New();
+
+ DALI_TEST_CHECK( handle );
+
+ effect = ScrollViewPageCubeEffect::DownCast(handle);
+
+ DALI_TEST_CHECK( effect );
+ END_TEST;
+}
+
+
+int UtcDaliScrollViewPageCarouselEffectSetup(void)
{
- ToolkitTestApplication application;
- tet_infoline(" UtcDaliScrollViewSlideEffectTest");
+ tet_infoline(" UtcDaliScrollViewCarouselEffectSetup");
- Vector2 size = Stage::GetCurrent().GetSize();
- Vector3 pageSize(size.x, size.y, 0.0f);
+ ScrollViewPageCarouselEffect effect;
- ScrollView scrollView = SetupTestScrollView(1, 3, size);
- Actor testPage = gPages[1];
- Wait(application, 500);
+ DALI_TEST_CHECK( !effect );
- ScrollViewSlideEffect effect = ScrollViewSlideEffect::New();
- effect.SetDelayReferenceOffset(pageSize * 0.25);
- DALI_TEST_EQUALS(effect.GetDelayReferenceOffset(), pageSize * 0.25, Math::MACHINE_EPSILON_0, TEST_LOCATION);
- effect.SetMaxDelayDuration(0.5f);
- DALI_TEST_EQUALS(effect.GetMaxDelayDuration(), 0.5f, Math::MACHINE_EPSILON_0, TEST_LOCATION);
- effect.SetSlideDirection(false);
- DALI_TEST_CHECK(!effect.GetSlideDirection());
+ BaseHandle handle = ScrollViewPageCarouselEffect::New();
- scrollView.ApplyEffect(effect);
+ DALI_TEST_CHECK( handle );
- Actor actor = AddActorToPage(testPage, 0.5f, 0.5f, 3, 3);
- Wait(application);
- Vector3 actorPrePosition = actor.GetCurrentPosition();
+ effect = ScrollViewPageCarouselEffect::DownCast(handle);
- effect.ApplyToActor(actor, 0.0f, 0.5f);
+ DALI_TEST_CHECK( effect );
+ END_TEST;
+}
- 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();
+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 UtcDaliScrollViewCustomEffectTest(void)
+
+int UtcDaliScrollViewPageCubeEffectTest(void)
{
ToolkitTestApplication application;
- tet_infoline(" UtcDaliScrollViewCustomEffectTest");
+ tet_infoline(" UtcDaliScrollViewPageCubeEffectTest");
Vector2 size = Stage::GetCurrent().GetSize();
- Vector3 pageSize(size.x, size.y, 0.0f);
ScrollView scrollView = SetupTestScrollView(1, 3, size);
Actor testPage = gPages[1];
Wait(application, 500);
- Vector3 pageStartPos, pagePos;
- pageStartPos = pagePos = testPage.GetCurrentPosition();
- //scrollView.RemoveConstraintsFromChildren();
- ScrollViewCustomEffect effect = ScrollViewCustomEffect::DownCast(scrollView.ApplyEffect(ScrollView::PageEffectCarousel));
+ 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, pageSize);
+ effect.ApplyToPage(page, Vector2(Math::PI_2, 0.0f));
}
Wait(application);
- pagePos = testPage.GetCurrentPosition();
- DALI_TEST_EQUALS(pagePos, pageStartPos, Math::MACHINE_EPSILON_0, TEST_LOCATION);
scrollView.ScrollTo(1);
while(!gOnScrollCompleteCalled)
{
Wait(application);
}
- ResetScrollCallbackResults();
// test that the first page has reached centre of screen
- pagePos = testPage.GetCurrentPosition();
+ Vector3 pagePos = testPage.GetCurrentPosition();
DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+ CleanupTest();
+ END_TEST;
+}
- // scroll back to page 0
- scrollView.ScrollTo(0);
- while(!gOnScrollCompleteCalled)
- {
- Wait(application);
- }
- ResetScrollCallbackResults();
- pagePos = testPage.GetCurrentPosition();
- DALI_TEST_EQUALS(pagePos, pageStartPos, Math::MACHINE_EPSILON_0, TEST_LOCATION);
-
- scrollView.RemoveEffect(effect);
-
- effect = ScrollViewCustomEffect::New();
- effect.SetPageTranslation(Vector3(20.0f, 20.0f, 5.0f));
- effect.SetPageTranslation(Vector3(20.0f, 20.0f, 5.0f), Vector3(20.0f, 20.0f, -5.0f));
- effect.SetPageTranslationIn(Vector3(20.0f, 20.0f, 5.0f));
- effect.SetPageTranslationOut(Vector3(20.0f, 20.0f, -5.0f));
- effect.SetPageTranslation(Vector3(20.0f, 0.0f, 0.0f));
- effect.SetSwingAngle(Math::PI, Vector3::YAXIS);
- effect.SetPageSpacing(Vector2(20.0f, 20.0f));
+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, pageSize);
+ effect.ApplyToPage(page);
}
Wait(application);
- pagePos = testPage.GetCurrentPosition();
- DALI_TEST_EQUALS(pagePos, pageStartPos, Math::MACHINE_EPSILON_0, TEST_LOCATION);
- scrollView.ScrollTo(1);
+ scrollView.ScrollTo(1, 0.5f, DirectionBiasNone);
while(!gOnScrollCompleteCalled)
{
Wait(application);
}
- ResetScrollCallbackResults();
// test that the first page has reached centre of screen
- pagePos = testPage.GetCurrentPosition();
+ Vector3 pagePos = testPage.GetCurrentPosition();
DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+ CleanupTest();
+ END_TEST;
+}
- // scroll back to page 0
- scrollView.ScrollTo(0);
- while(!gOnScrollCompleteCalled)
- {
- Wait(application);
- }
- ResetScrollCallbackResults();
- pagePos = testPage.GetCurrentPosition();
- DALI_TEST_EQUALS(pagePos, pageStartPos, Math::MACHINE_EPSILON_0, TEST_LOCATION);
-
- scrollView.RemoveEffect(effect);
- effect = ScrollViewCustomEffect::New();
- effect.SetSwingAngle(Math::PI, Vector3::YAXIS);
- effect.SetSwingAnchor(AnchorPoint::CENTER_LEFT);
- effect.SetPageTranslation(Vector3(size.x, size.y, 0));
- effect.SetOpacityThreshold(0.66f);
+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);
- 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, pageSize);
- }
+ Actor actor = AddActorToPage(testPage, 0.5f, 0.5f, 3, 3);
Wait(application);
+ Vector3 actorPrePosition = actor.GetCurrentPosition();
- scrollView.ScrollTo(1);
+ 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);
}
- ResetScrollCallbackResults();
// test that the first page has reached centre of screen
- pagePos = testPage.GetCurrentPosition();
- DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+ Vector3 actorPostPosition = actor.GetCurrentPosition();
+ // just check the actor has moved
+ DALI_TEST_CHECK((actorPostPosition - actorPrePosition).Length() > Math::MACHINE_EPSILON_1);
+ CleanupTest();
+ END_TEST;
+}
- // scroll back to page 0
- scrollView.ScrollTo(0);
+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);
}
- ResetScrollCallbackResults();
- pagePos = testPage.GetCurrentPosition();
- DALI_TEST_EQUALS(pagePos, pageStartPos, Math::MACHINE_EPSILON_0, TEST_LOCATION);
- scrollView.RemoveEffect(effect);
-
-
- effect.SetPageTranslateAlphaFunction(AlphaFunctions::Linear);
- effect.SetPageTranslateAlphaFunction(AlphaFunctions::Linear, AlphaFunctions::Linear);
- effect.SetPageTranslateAlphaFunctionIn(AlphaFunctions::Linear);
- effect.SetPageTranslateAlphaFunctionOut(AlphaFunctions::Linear);
- effect.SetGlobalPageRotation(Math::PI, Vector3::YAXIS);
- effect.SetAngledOriginPageRotation(Vector3(Math::PI, Math::PI, 0.0f));
- effect.SetGlobalPageRotation(Math::PI, Vector3::YAXIS, Math::PI, Vector3::YAXIS);
- effect.SetGlobalPageRotationIn(Math::PI, Vector3::YAXIS);
- effect.SetGlobalPageRotationOut(Math::PI, Vector3::YAXIS);
- effect.SetGlobalPageRotationOrigin(Vector3::ZERO);
- effect.SetGlobalPageRotationOrigin(Vector3::ZERO, Vector3::ZERO);
- effect.SetGlobalPageRotationOriginIn(Vector3::ZERO);
- effect.SetGlobalPageRotationOriginOut(Vector3::ZERO);
- effect.SetSwingAngle(Math::PI, Vector3::YAXIS);
- effect.SetSwingAngle(Math::PI, Vector3::YAXIS, Math::PI, Vector3::YAXIS);
- effect.SetSwingAngleIn(Math::PI, Vector3::YAXIS);
- effect.SetSwingAngleOut(Math::PI, Vector3::YAXIS);
- effect.SetSwingAngleAlphaFunction(AlphaFunctions::Linear);
- effect.SetSwingAngleAlphaFunction(AlphaFunctions::Linear, AlphaFunctions::Linear);
- effect.SetSwingAngleAlphaFunctionIn(AlphaFunctions::Linear);
- effect.SetSwingAngleAlphaFunctionOut(AlphaFunctions::Linear);
- effect.SetSwingAnchor(AnchorPoint::CENTER, AnchorPoint::CENTER_LEFT);
- effect.SetSwingAnchorIn(AnchorPoint::CENTER);
- effect.SetSwingAnchorOut(AnchorPoint::CENTER);
- effect.SetSwingAnchorAlphaFunction(AlphaFunctions::Linear);
- effect.SetSwingAnchorAlphaFunction(AlphaFunctions::Linear, AlphaFunctions::Linear);
- effect.SetSwingAnchorAlphaFunctionIn(AlphaFunctions::Linear);
- effect.SetSwingAnchorAlphaFunctionOut(AlphaFunctions::Linear);
- effect.SetOpacityThreshold(0.5f);
- effect.SetOpacityThreshold(0.5f, 0.5f);
- effect.SetOpacityThresholdIn(0.5f);
- effect.SetOpacityThresholdOut(0.5f);
- effect.SetOpacityAlphaFunction(AlphaFunctions::Linear);
- effect.SetOpacityAlphaFunction(AlphaFunctions::Linear, AlphaFunctions::Linear);
- effect.SetOpacityAlphaFunctionIn(AlphaFunctions::Linear);
- effect.SetOpacityAlphaFunctionOut(AlphaFunctions::Linear);
+ // 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;
}
return ret;
}
-Toolkit::Builder::Signal& Builder::QuitSignal()
+Toolkit::Builder::BuilderSignalType& Builder::QuitSignal()
{
return mQuitSignal;
}
/**
* @copydoc Toolkit::Builder::QuitSignal
*/
- Toolkit::Builder::Signal& QuitSignal();
+ Toolkit::Builder::BuilderSignalType& QuitSignal();
/**
* Emits the quit signal
void SetProperties( const TreeNode& node, Handle& handle, const Replacement& constant );
- Toolkit::Builder::Signal mQuitSignal;
+ Toolkit::Builder::BuilderSignalType mQuitSignal;
};
} // namespace Internal
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:
#include <dali/public-api/events/touch-event.h>
#include <dali/public-api/object/type-registry.h>
-namespace
-{
-const char* const PROPERTY_DIMMED = "dimmed";
-} // unnamed namespace
-
namespace Dali
{
namespace Toolkit
{
-const Property::Index Button::PROPERTY_DIMMED( Internal::Button::BUTTON_PROPERTY_START_INDEX );
+const Property::Index Button::PROPERTY_DISABLED = Internal::Button::BUTTON_PROPERTY_START_INDEX;
+const Property::Index Button::PROPERTY_AUTO_REPEATING = Internal::Button::BUTTON_PROPERTY_START_INDEX + 1;
+const Property::Index Button::PROPERTY_INITIAL_AUTO_REPEATING_DELAY = Internal::Button::BUTTON_PROPERTY_START_INDEX + 2;
+const Property::Index Button::PROPERTY_NEXT_AUTO_REPEATING_DELAY = Internal::Button::BUTTON_PROPERTY_START_INDEX + 3;
+const Property::Index Button::PROPERTY_TOGGLABLE = Internal::Button::BUTTON_PROPERTY_START_INDEX + 4;
+const Property::Index Button::PROPERTY_TOGGLED = Internal::Button::BUTTON_PROPERTY_START_INDEX + 5;
+const Property::Index Button::PROPERTY_NORMAL_STATE_ACTOR = Internal::Button::BUTTON_PROPERTY_START_INDEX + 6;
+const Property::Index Button::PROPERTY_SELECTED_STATE_ACTOR = Internal::Button::BUTTON_PROPERTY_START_INDEX + 7;
+const Property::Index Button::PROPERTY_DISABLED_STATE_ACTOR = Internal::Button::BUTTON_PROPERTY_START_INDEX + 8;
+const Property::Index Button::PROPERTY_LABEL_ACTOR = Internal::Button::BUTTON_PROPERTY_START_INDEX + 9;
namespace Internal
{
TypeRegistration typeRegistration( typeid(Toolkit::Button), typeid(Toolkit::Control), Create );
SignalConnectorType signalConnector1( typeRegistration, Toolkit::Button::SIGNAL_CLICKED, &Button::DoConnectSignal );
-SignalConnectorType signalConnector2( typeRegistration, Toolkit::Button::SIGNAL_TOGGLED, &Button::DoConnectSignal );
-
-PropertyRegistration property1( typeRegistration, "dimmed", Toolkit::Button::PROPERTY_DIMMED, Property::BOOLEAN, &Button::SetProperty, &Button::GetProperty );
+SignalConnectorType signalConnector2( typeRegistration, Toolkit::Button::SIGNAL_STATE_CHANGED, &Button::DoConnectSignal );
+
+PropertyRegistration property1( typeRegistration, "disabled", Toolkit::Button::PROPERTY_DISABLED, Property::BOOLEAN, &Button::SetProperty, &Button::GetProperty );
+PropertyRegistration property2( typeRegistration, "auto-repeating", Toolkit::Button::PROPERTY_AUTO_REPEATING, Property::BOOLEAN, &Button::SetProperty, &Button::GetProperty );
+PropertyRegistration property3( typeRegistration, "initial-auto-repeating-delay", Toolkit::Button::PROPERTY_INITIAL_AUTO_REPEATING_DELAY, Property::FLOAT, &Button::SetProperty, &Button::GetProperty );
+PropertyRegistration property4( typeRegistration, "next-auto-repeating-delay", Toolkit::Button::PROPERTY_NEXT_AUTO_REPEATING_DELAY, Property::FLOAT, &Button::SetProperty, &Button::GetProperty );
+PropertyRegistration property5( typeRegistration, "togglable", Toolkit::Button::PROPERTY_TOGGLABLE, Property::BOOLEAN, &Button::SetProperty, &Button::GetProperty );
+PropertyRegistration property6( typeRegistration, "toggled", Toolkit::Button::PROPERTY_TOGGLED, Property::BOOLEAN, &Button::SetProperty, &Button::GetProperty );
+PropertyRegistration property7( typeRegistration, "normal-state-actor", Toolkit::Button::PROPERTY_NORMAL_STATE_ACTOR, Property::MAP, &Button::SetProperty, &Button::GetProperty );
+PropertyRegistration property8( typeRegistration, "selected-state-actor", Toolkit::Button::PROPERTY_SELECTED_STATE_ACTOR, Property::MAP, &Button::SetProperty, &Button::GetProperty );
+PropertyRegistration property9( typeRegistration, "disabled-state-actor", Toolkit::Button::PROPERTY_DISABLED_STATE_ACTOR, Property::MAP, &Button::SetProperty, &Button::GetProperty );
+PropertyRegistration property10( typeRegistration, "label-actor", Toolkit::Button::PROPERTY_LABEL_ACTOR, Property::MAP, &Button::SetProperty, &Button::GetProperty );
} // unnamed namespace
Button::Button()
: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),
+ mPainter( NULL ),
mState( ButtonUp ),
- mDimmed( false ),
- mPainter( NULL )
+ mDisabled( false )
{
}
{
}
-void Button::SetDimmed( bool dimmed )
+void Button::SetDisabled( bool disabled )
{
- mDimmed = dimmed;
+ mDisabled = disabled;
// Notifies the painter.
Toolkit::Button handle( GetOwner() );
if( mPainter )
{
- mPainter->SetDimmed( handle, mDimmed );
+ mPainter->SetDisabled( handle, mDisabled );
}
}
-bool Button::IsDimmed() const
+bool Button::IsDisabled() const
{
- return mDimmed;
+ return mDisabled;
}
void Button::SetAnimationTime( float animationTime )
// nothing to do.
}
+void Button::OnButtonDown()
+{
+
+}
+
+void Button::OnButtonUp()
+{
+
+}
+
float Button::OnAnimationTimeRequested() const
{
return 0.f;
}
-Toolkit::Button::ClickedSignalV2& Button::ClickedSignal()
+Toolkit::Button::ClickedSignalType& Button::ClickedSignal()
{
- return mClickedSignalV2;
+ return mClickedSignal;
}
-Toolkit::Button::ToggledSignalV2& Button::ToggledSignal()
+Toolkit::Button::StateChangedSignalType& Button::StateChangedSignal()
{
- return mToggledSignalV2;
+ return mStateChangedSignal;
}
bool Button::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
{
button.ClickedSignal().Connect( tracker, functor );
}
- else if( Dali::Toolkit::Button::SIGNAL_TOGGLED == signalName )
+ else if( Dali::Toolkit::Button::SIGNAL_STATE_CHANGED == signalName )
{
- button.ToggledSignal().Connect( tracker, functor );
+ button.StateChangedSignal().Connect( tracker, functor );
}
else
{
bool Button::OnTouchEvent(const TouchEvent& event)
{
- // Only events are processed when the button is not dimmed and the touch event has only
+ // Only events are processed when the button is not disabled and the touch event has only
// one touch point.
- if( ( !mDimmed ) && ( 1 == event.GetPointCount() ) )
+ if( ( !mDisabled ) && ( 1 == event.GetPointCount() ) )
{
switch( event.GetPoint(0).state )
{
{
Toolkit::Button button = Toolkit::Button::DownCast( Dali::BaseHandle( object ) );
- if ( button && ( index == Toolkit::Button::PROPERTY_DIMMED ) )
+ if ( button && ( index == Toolkit::Button::PROPERTY_DISABLED ) )
{
- GetImplementation( button ).SetDimmed( value.Get<bool>() );
+ GetImplementation( button ).SetDisabled( value.Get<bool>() );
}
}
{
Toolkit::Button button = Toolkit::Button::DownCast( Dali::BaseHandle( object ) );
- if ( button && ( propertyIndex == Toolkit::Button::PROPERTY_DIMMED ) )
+ if ( button && ( propertyIndex == Toolkit::Button::PROPERTY_DISABLED ) )
{
- return Property::Value( GetImplementation( button ).mDimmed );
+ return Property::Value( GetImplementation( button ).mDisabled );
}
return Property::Value();
public:
/**
- * @copydoc Dali::Toolkit::Button::SetDimmed( bool dimmed )
+ * @copydoc Dali::Toolkit::Button::SetDisabled( bool disabled )
*/
- void SetDimmed( bool dimmed );
+ void SetDisabled( bool disabled );
/**
- * @copydoc Dali::Toolkit::Button::IsDimmed() const
+ * @copydoc Dali::Toolkit::Button::IsDisabled() const
*/
- bool IsDimmed() const;
+ bool IsDisabled() const;
/**
* @copydoc Dali::Toolkit::Button::SetAnimationTime()
* This method is called from the OnTouchEvent method when the button is down.
* Could be reimplemented in subclasses to provide specific behaviour.
*/
- virtual void OnButtonDown() { }
+ virtual void OnButtonDown();
/**
* This method is called from the OnTouchEvent method when the button is up.
* Could be reimplemented in subclasses to provide specific behaviour.
*/
- virtual void OnButtonUp() { }
+ virtual void OnButtonUp();
/**
* This method is called from the OnTouchEvent method when the touch point leaves the boundary of the button or
/**
* @copydoc Dali::Toolkit::Button::ClickedSignal()
*/
- Toolkit::Button::ClickedSignalV2& ClickedSignal();
+ Toolkit::Button::ClickedSignalType& ClickedSignal();
/**
- * @copydoc Dali::Toolkit::Button::ToggledSignal()
+ * @copydoc Dali::Toolkit::Button::StateChangedSignal()
*/
- Toolkit::Button::ToggledSignalV2& ToggledSignal();
+ Toolkit::Button::StateChangedSignalType& StateChangedSignal();
/**
* Connects a callback function with the object's signals.
// Undefined
Button& operator = ( const Button& );
-protected: // Signals
+protected:
enum ButtonState
{
ButtonDown, ///< The button is down.
};
- ButtonState mState; ///< Stores the button state.
-
- bool mDimmed; ///< Stores the dimmed property.
-
ButtonPainterPtr mPainter; ///< Pointer to a ButtonPainter base class.
- Toolkit::Button::ClickedSignalV2 mClickedSignalV2; ///< Signal emitted when the button is clicked.
- Toolkit::Button::ToggledSignalV2 mToggledSignalV2; ///< Signal emitted when the button is toggled.
+ Toolkit::Button::ClickedSignalType mClickedSignal; ///< Signal emitted when the button is clicked.
+ Toolkit::Button::StateChangedSignalType mStateChangedSignal; ///< Signal emitted when the button's state is changed.
TapGestureDetector mTapDetector;
+
+ ButtonState mState; ///< Stores the button state.
+
+ bool mDisabled; ///< Stores the disabled property.
};
} // namespace Internal
virtual void SetSize( Toolkit::Button& button, const Vector3& size ) = 0;
/**
- * This method is called from the Dali::Toolkit::Internal::PushButton when the \e dimmed property changes.
+ * This method is called from the Dali::Toolkit::Internal::PushButton when the \e disabled property changes.
*
* @param[inout] button The button in which all actors that form its appearance are going to be added.
- * @param[in] dimmed The dimmed state.
+ * @param[in] disabled The disabled state.
*/
- virtual void SetDimmed( Toolkit::Button& button, bool dimmed ) = 0;
+ virtual void SetDisabled( Toolkit::Button& button, bool disabled ) = 0;
/**
* Sets the animation time.
const float ANIMATION_TIME( 0.26f ); // EFL checkbox tick time
-const std::string PERCENTAGE_PARENT_SIZE_PROPERTY_NAME( "percentage-parent-size" );
-
-
-/**
- * Constraint to wrap an actor in y that is moving vertically
- */
-Vector3 EqualToPercentageWidthConstraint( const Vector3& current,
- const PropertyInput& percentageProperty,
- const PropertyInput& parentSizeProperty )
-{
- float percentage = percentageProperty.GetFloat();
- const Vector3& parentSize = parentSizeProperty.GetVector3();
-
- Vector3 size( parentSize );
- size.x *= percentage;
-
- return size;
-}
-
-
inline Toolkit::Internal::CheckBoxButton& GetCheckBoxButtonImpl( Toolkit::Button& button )
{
DALI_ASSERT_ALWAYS( button );
CheckBoxButtonDefaultPainter::CheckBoxButtonDefaultPainter()
: CheckBoxButtonPainter(),
- mDimmed( false ),
+ mDisabled( false ),
mPaintState( UncheckedState ),
mButton(NULL),
- mAnimationTime( ANIMATION_TIME ),
- mPercentageParentSizeProperty( Property::INVALID_INDEX )
+ mAnimationTime( ANIMATION_TIME )
{
}
}
break;
}
- case DimmedUncheckedTransition: // FALLTHROUGH
- case DimmedCheckedTransition:
+ case DisabledUncheckedTransition: // FALLTHROUGH
+ case DisabledCheckedTransition:
{
StopCheckInAnimation();
checkBox.Remove( backgroundImage );
StartCheckInAnimation();
break;
}
- case CheckedDimmedTransition: // FALLTHROUGH
- case UncheckedDimmedTransition:
+ case CheckedDisabledTransition: // FALLTHROUGH
+ case UncheckedDisabledTransition:
{
float opacity = 1.f;
if( fadeOutBackgroundImage )
break;
}
case UncheckedCheckedTransition: // FALLTHROUGH
- case DimmedCheckedTransition:
+ case DisabledCheckedTransition:
{
StopCheckInAnimation();
checkBox.Remove( checkedImage );
break;
}
case CheckedUncheckedTransition: // FALLTHROUGH
- case CheckedDimmedTransition:
+ case CheckedDisabledTransition:
{
float opacity = 1.f;
if( fadeOutCheckedImage )
ApplyCheckedConstraint( checkedImage, FOREGROUND_DEPTH );
}
-void CheckBoxButtonDefaultPainter::SetDimmedCheckedImage( Toolkit::CheckBoxButton& checkBox, Actor image )
+void CheckBoxButtonDefaultPainter::SetDisabledCheckedImage( Toolkit::CheckBoxButton& checkBox, Actor image )
{
Toolkit::Internal::CheckBoxButton& checkBoxImpl = GetImplementation( checkBox );
- Actor& dimmedCheckedImage = checkBoxImpl.GetDimmedCheckedImage();
+ Actor& disabledCheckedImage = checkBoxImpl.GetDisabledCheckedImage();
Actor& fadeOutCheckedImage = checkBoxImpl.GetFadeOutCheckedImage();
switch( mPaintState )
{
- case DimmedCheckedState:
+ case DisabledCheckedState:
{
- if( dimmedCheckedImage && dimmedCheckedImage.GetParent() )
+ if( disabledCheckedImage && disabledCheckedImage.GetParent() )
{
StopCheckOutAnimation( checkBox );
- FadeOutImage( checkBox, Foreground, dimmedCheckedImage );
+ FadeOutImage( checkBox, Foreground, disabledCheckedImage );
- dimmedCheckedImage = image;
+ disabledCheckedImage = image;
- FadeInImage( checkBox, dimmedCheckedImage );
+ FadeInImage( checkBox, disabledCheckedImage );
StartCheckOutAnimation( checkBox );
StartCheckInAnimation();
}
else
{
- dimmedCheckedImage = image;
- checkBox.Add( dimmedCheckedImage );
+ disabledCheckedImage = image;
+ checkBox.Add( disabledCheckedImage );
}
break;
}
- case CheckedDimmedTransition:
+ case CheckedDisabledTransition:
{
StopCheckInAnimation();
- checkBox.Remove( dimmedCheckedImage );
+ checkBox.Remove( disabledCheckedImage );
- dimmedCheckedImage = image;
+ disabledCheckedImage = image;
- FadeInImage( checkBox, dimmedCheckedImage );
+ FadeInImage( checkBox, disabledCheckedImage );
StartCheckInAnimation();
break;
}
- case DimmedCheckedTransition:
+ case DisabledCheckedTransition:
{
float opacity = 1.f;
if( fadeOutCheckedImage )
StopCheckOutAnimation( checkBox );
// Replaces the button image.
- dimmedCheckedImage = image;
+ disabledCheckedImage = image;
- checkBox.Add( dimmedCheckedImage );
- FadeOutImage( checkBox, Foreground, dimmedCheckedImage, opacity );
+ checkBox.Add( disabledCheckedImage );
+ FadeOutImage( checkBox, Foreground, disabledCheckedImage, opacity );
StartCheckOutAnimation( checkBox );
break;
}
default:
{
- dimmedCheckedImage = image;
+ disabledCheckedImage = image;
break;
}
}
- dimmedCheckedImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- dimmedCheckedImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
- ApplyConstraint( dimmedCheckedImage, FOREGROUND_DEPTH );
+ disabledCheckedImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ disabledCheckedImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ ApplyConstraint( disabledCheckedImage, FOREGROUND_DEPTH );
}
-void CheckBoxButtonDefaultPainter::SetDimmedBackgroundImage( Toolkit::CheckBoxButton& checkBox, Actor image )
+void CheckBoxButtonDefaultPainter::SetDisabledBackgroundImage( Toolkit::CheckBoxButton& checkBox, Actor image )
{
Toolkit::Internal::CheckBoxButton& checkBoxImpl = GetImplementation( checkBox );
- Actor& dimmedBackgroundImage = checkBoxImpl.GetDimmedBackgroundImage();
+ Actor& disabledBackgroundImage = checkBoxImpl.GetDisabledBackgroundImage();
Actor& fadeOutBackgroundImage = checkBoxImpl.GetFadeOutBackgroundImage();
switch( mPaintState )
{
- case DimmedCheckedState: // FALLTHROUGH
- case DimmedUncheckedState:
+ case DisabledCheckedState: // FALLTHROUGH
+ case DisabledUncheckedState:
{
- if( dimmedBackgroundImage && dimmedBackgroundImage.GetParent() )
+ if( disabledBackgroundImage && disabledBackgroundImage.GetParent() )
{
StopCheckOutAnimation( checkBox );
- FadeOutImage( checkBox, Background, dimmedBackgroundImage );
+ FadeOutImage( checkBox, Background, disabledBackgroundImage );
- dimmedBackgroundImage = image;
+ disabledBackgroundImage = image;
- FadeInImage( checkBox, dimmedBackgroundImage );
+ FadeInImage( checkBox, disabledBackgroundImage );
StartCheckOutAnimation( checkBox );
StartCheckInAnimation();
}
else
{
- dimmedBackgroundImage = image;
- checkBox.Add( dimmedBackgroundImage );
+ disabledBackgroundImage = image;
+ checkBox.Add( disabledBackgroundImage );
}
break;
}
- case UncheckedDimmedTransition: // FALLTHROUGH
- case CheckedDimmedTransition:
+ case UncheckedDisabledTransition: // FALLTHROUGH
+ case CheckedDisabledTransition:
{
StopCheckInAnimation();
- checkBox.Remove( dimmedBackgroundImage );
+ checkBox.Remove( disabledBackgroundImage );
- dimmedBackgroundImage = image;
+ disabledBackgroundImage = image;
- FadeInImage( checkBox, dimmedBackgroundImage );
+ FadeInImage( checkBox, disabledBackgroundImage );
StartCheckInAnimation();
break;
}
- case DimmedUncheckedTransition: // FALLTHROUGH
- case DimmedCheckedTransition:
+ case DisabledUncheckedTransition: // FALLTHROUGH
+ case DisabledCheckedTransition:
{
float opacity = 1.f;
if( fadeOutBackgroundImage )
StopCheckOutAnimation( checkBox );
// Replaces the button image.
- dimmedBackgroundImage = image;
+ disabledBackgroundImage = image;
- checkBox.Add( dimmedBackgroundImage );
- FadeOutImage( checkBox, Background, dimmedBackgroundImage, opacity );
+ checkBox.Add( disabledBackgroundImage );
+ FadeOutImage( checkBox, Background, disabledBackgroundImage, opacity );
StartCheckOutAnimation( checkBox );
break;
}
default:
{
- dimmedBackgroundImage = image;
+ disabledBackgroundImage = image;
break;
}
}
- dimmedBackgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- dimmedBackgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
- ApplyConstraint( dimmedBackgroundImage, BACKGROUND_DEPTH );
+ disabledBackgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ disabledBackgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ ApplyConstraint( disabledBackgroundImage, BACKGROUND_DEPTH );
}
void CheckBoxButtonDefaultPainter::Initialize( Toolkit::Button& button )
Toolkit::Internal::CheckBoxButton& buttonImpl = GetCheckBoxButtonImpl( button );
Actor& backgroundImage = buttonImpl.GetBackgroundImage();
Actor& checkedImage = buttonImpl.GetCheckedImage();
- Actor& dimmedBackgroundImage = buttonImpl.GetDimmedBackgroundImage();
- Actor& dimmedCheckedImage = buttonImpl.GetDimmedCheckedImage();
+ Actor& disabledBackgroundImage = buttonImpl.GetDisabledBackgroundImage();
+ Actor& disabledCheckedImage = buttonImpl.GetDisabledCheckedImage();
Toolkit::CheckBoxButton& checkBox = static_cast<Toolkit::CheckBoxButton&>( button );
SetCheckedImage( checkBox, checkedImage );
}
- if( dimmedBackgroundImage )
+ if( disabledBackgroundImage )
{
- SetDimmedBackgroundImage( checkBox, dimmedBackgroundImage );
+ SetDisabledBackgroundImage( checkBox, disabledBackgroundImage );
}
- if( dimmedCheckedImage )
+ if( disabledCheckedImage )
{
- SetDimmedCheckedImage( checkBox, dimmedCheckedImage );
+ SetDisabledCheckedImage( checkBox, disabledCheckedImage );
}
- SetDimmed( button, mDimmed );
+ SetDisabled( button, mDisabled );
}
void CheckBoxButtonDefaultPainter::SetSize( Toolkit::Button& button, const Vector3& size )
Toolkit::Internal::CheckBoxButton& buttonImpl = GetCheckBoxButtonImpl( button );
Actor& backgroundImage = buttonImpl.GetBackgroundImage();
Actor& checkedImage = buttonImpl.GetCheckedImage();
- Actor& dimmedBackgroundImage = buttonImpl.GetDimmedBackgroundImage();
- Actor& dimmedCheckedImage = buttonImpl.GetDimmedCheckedImage();
+ Actor& disabledBackgroundImage = buttonImpl.GetDisabledBackgroundImage();
+ Actor& disabledCheckedImage = buttonImpl.GetDisabledCheckedImage();
ApplyCheckedConstraint( checkedImage, FOREGROUND_DEPTH );
ApplyConstraint( backgroundImage, BACKGROUND_DEPTH );
- ApplyConstraint( dimmedCheckedImage, FOREGROUND_DEPTH );
- ApplyConstraint( dimmedBackgroundImage, BACKGROUND_DEPTH );
+ ApplyConstraint( disabledCheckedImage, FOREGROUND_DEPTH );
+ ApplyConstraint( disabledBackgroundImage, BACKGROUND_DEPTH );
}
-void CheckBoxButtonDefaultPainter::SetDimmed( Toolkit::Button& button, bool dimmed )
+void CheckBoxButtonDefaultPainter::SetDisabled( Toolkit::Button& button, bool disabled )
{
- mDimmed = dimmed;
+ mDisabled = disabled;
Toolkit::Internal::CheckBoxButton& buttonImpl = GetCheckBoxButtonImpl( button );
Actor& backgroundImage = buttonImpl.GetBackgroundImage();
Actor& checkedImage = buttonImpl.GetCheckedImage();
- Actor& dimmedBackgroundImage = buttonImpl.GetDimmedBackgroundImage();
- Actor& dimmedCheckedImage = buttonImpl.GetDimmedCheckedImage();
+ Actor& disabledBackgroundImage = buttonImpl.GetDisabledBackgroundImage();
+ Actor& disabledCheckedImage = buttonImpl.GetDisabledCheckedImage();
Actor& fadeOutCheckedImage = buttonImpl.GetFadeOutCheckedImage();
Actor& fadeOutBackgroundImage = buttonImpl.GetFadeOutBackgroundImage();
{
case UncheckedState:
{
- if( dimmed )
+ if( disabled )
{
StopCheckOutAnimation( checkBox );
FadeOutImage( checkBox, Background, backgroundImage );
- FadeInImage( checkBox, dimmedBackgroundImage );
+ FadeInImage( checkBox, disabledBackgroundImage );
StartCheckOutAnimation( checkBox );
StartCheckInAnimation();
- mPaintState = UncheckedDimmedTransition;
+ mPaintState = UncheckedDisabledTransition;
}
break;
}
case CheckedState:
{
- if( dimmed )
+ if( disabled )
{
StopCheckOutAnimation( checkBox );
FadeOutImage( checkBox, Background, backgroundImage );
FadeOutImage( checkBox, Foreground, checkedImage );
- FadeInImage( checkBox, dimmedCheckedImage );
- FadeInImage( checkBox, dimmedBackgroundImage );
+ FadeInImage( checkBox, disabledCheckedImage );
+ FadeInImage( checkBox, disabledBackgroundImage );
StartCheckOutAnimation( checkBox );
StartCheckInAnimation();
- mPaintState = CheckedDimmedTransition;
+ mPaintState = CheckedDisabledTransition;
}
break;
}
- case DimmedUncheckedState:
+ case DisabledUncheckedState:
{
- if( !dimmed )
+ if( !disabled )
{
StopCheckOutAnimation( checkBox );
- FadeOutImage( checkBox, Background, dimmedBackgroundImage );
+ FadeOutImage( checkBox, Background, disabledBackgroundImage );
FadeInImage( checkBox, backgroundImage );
StartCheckOutAnimation( checkBox );
StartCheckInAnimation();
- mPaintState = DimmedUncheckedTransition;
+ mPaintState = DisabledUncheckedTransition;
}
break;
}
- case DimmedCheckedState:
+ case DisabledCheckedState:
{
- if( !dimmed )
+ if( !disabled )
{
StopCheckOutAnimation( checkBox );
- FadeOutImage( checkBox, Background, dimmedBackgroundImage );
- FadeOutImage( checkBox, Foreground, dimmedCheckedImage );
+ FadeOutImage( checkBox, Background, disabledBackgroundImage );
+ FadeOutImage( checkBox, Foreground, disabledCheckedImage );
FadeInImage( checkBox, backgroundImage );
FadeInImage( checkBox, checkedImage );
StartCheckOutAnimation( checkBox );
StartCheckInAnimation();
- mPaintState = DimmedCheckedTransition;
+ mPaintState = DisabledCheckedTransition;
}
break;
}
case UncheckedCheckedTransition:
{
- if( dimmed )
+ if( disabled )
{
float opacity = 1.f;
if( checkedImage )
FadeOutImage( checkBox, Foreground, checkedImage, opacity );
FadeOutImage( checkBox, Background, backgroundImage );
- FadeInImage( checkBox, dimmedCheckedImage );
- FadeInImage( checkBox, dimmedBackgroundImage );
+ FadeInImage( checkBox, disabledCheckedImage );
+ FadeInImage( checkBox, disabledBackgroundImage );
StartCheckOutAnimation( checkBox );
StartCheckInAnimation();
- mPaintState = CheckedDimmedTransition;
+ mPaintState = CheckedDisabledTransition;
}
break;
}
case CheckedUncheckedTransition:
{
- if( dimmed )
+ if( disabled )
{
float opacity = 1.f;
if( fadeOutCheckedImage )
StopCheckOutAnimation( checkBox );
StopCheckInAnimation();
- button.Add( dimmedCheckedImage );
- FadeOutImage( checkBox, Foreground, dimmedCheckedImage, opacity );
+ button.Add( disabledCheckedImage );
+ FadeOutImage( checkBox, Foreground, disabledCheckedImage, opacity );
FadeOutImage( checkBox, Background, backgroundImage );
- FadeInImage( checkBox, dimmedBackgroundImage );
+ FadeInImage( checkBox, disabledBackgroundImage );
StartCheckOutAnimation( checkBox );
StartCheckInAnimation();
- mPaintState = UncheckedDimmedTransition;
+ mPaintState = UncheckedDisabledTransition;
}
break;
}
- case UncheckedDimmedTransition:
+ case UncheckedDisabledTransition:
{
- if( !dimmed )
+ if( !disabled )
{
float opacity = 1.f;
if( fadeOutBackgroundImage )
StopCheckOutAnimation( checkBox, false );
StopCheckInAnimation();
- FadeOutImage( checkBox, Background, dimmedBackgroundImage, 1.f - opacity );
+ FadeOutImage( checkBox, Background, disabledBackgroundImage, 1.f - opacity );
FadeInImage( checkBox, backgroundImage, opacity );
StartCheckOutAnimation( checkBox );
StartCheckInAnimation();
- mPaintState = DimmedUncheckedTransition;
+ mPaintState = DisabledUncheckedTransition;
}
break;
}
- case DimmedUncheckedTransition:
+ case DisabledUncheckedTransition:
{
- if( dimmed )
+ if( disabled )
{
float opacity = 1.f;
if( fadeOutBackgroundImage )
StopCheckInAnimation();
FadeOutImage( checkBox, Background, backgroundImage, 1.f - opacity );
- FadeInImage( checkBox, dimmedBackgroundImage, opacity );
+ FadeInImage( checkBox, disabledBackgroundImage, opacity );
StartCheckOutAnimation( checkBox );
StartCheckInAnimation();
- mPaintState = UncheckedDimmedTransition;
+ mPaintState = UncheckedDisabledTransition;
}
break;
}
- case CheckedDimmedTransition:
+ case CheckedDisabledTransition:
{
- if( !dimmed )
+ if( !disabled )
{
float opacity = 1.f;
if( fadeOutBackgroundImage )
StopCheckOutAnimation( checkBox, false );
StopCheckInAnimation();
- FadeOutImage( checkBox, Foreground, dimmedCheckedImage, 1.f - opacity );
- FadeOutImage( checkBox, Background, dimmedBackgroundImage, 1.f - opacity );
+ FadeOutImage( checkBox, Foreground, disabledCheckedImage, 1.f - opacity );
+ FadeOutImage( checkBox, Background, disabledBackgroundImage, 1.f - opacity );
FadeInImage( checkBox, checkedImage, opacity );
FadeInImage( checkBox, backgroundImage, opacity );
StartCheckOutAnimation( checkBox );
StartCheckInAnimation();
- mPaintState = DimmedCheckedTransition;
+ mPaintState = DisabledCheckedTransition;
}
break;
}
- case DimmedCheckedTransition:
+ case DisabledCheckedTransition:
{
- if( dimmed )
+ if( disabled )
{
float opacity = 1.f;
if( fadeOutBackgroundImage )
FadeOutImage( checkBox, Foreground, checkedImage, 1.f - opacity );
FadeOutImage( checkBox, Background, backgroundImage, 1.f - opacity );
- FadeInImage( checkBox, dimmedCheckedImage, opacity );
- FadeInImage( checkBox, dimmedBackgroundImage, opacity );
+ FadeInImage( checkBox, disabledCheckedImage, opacity );
+ FadeInImage( checkBox, disabledBackgroundImage, opacity );
StartCheckOutAnimation( checkBox );
StartCheckInAnimation();
- mPaintState = CheckedDimmedTransition;
+ mPaintState = CheckedDisabledTransition;
}
break;
}
FadeOutImage( button, Foreground, checkedImage );
StartCheckOutAnimation( button );
- if( button.GetProperty<bool>( button.GetPropertyIndex( Toolkit::CheckBoxButton::USE_FADE_ANIMATION_PROPERTY_NAME ) ) )
- {
- mPaintState = CheckedUncheckedTransition;
- }
- else
- {
- mPaintState = UncheckedState;
- }
+ mPaintState = UncheckedState;
break;
}
case UncheckedCheckedTransition:
FadeOutImage( button, Foreground, checkedImage, opacity );
StartCheckOutAnimation( button );
- if( button.GetProperty<bool>( button.GetPropertyIndex( Toolkit::CheckBoxButton::USE_FADE_ANIMATION_PROPERTY_NAME ) ) )
- {
- mPaintState = CheckedUncheckedTransition;
- }
- else
- {
- mPaintState = UncheckedState;
- }
+ mPaintState = UncheckedState;
break;
}
case CheckedUncheckedTransition:
{
if( actor )
{
- if( mPercentageParentSizeProperty == Property::INVALID_INDEX )
- {
- mPercentageParentSizeProperty = actor.RegisterProperty( PERCENTAGE_PARENT_SIZE_PROPERTY_NAME, 1.0f );
- }
-
actor.RemoveConstraints();
- actor.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE,
- LocalSource( mPercentageParentSizeProperty ),
- ParentSource( Actor::SIZE ),
- EqualToPercentageWidthConstraint ) );
+ actor.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
actor.SetZ( depth );
}
}
checkBox.Add( image );
}
- if( checkBox.GetProperty<bool>( checkBox.GetPropertyIndex( Toolkit::CheckBoxButton::USE_FADE_ANIMATION_PROPERTY_NAME ) ) )
- {
- image.SetOpacity( opacity );
- AddToFadeInAnimation( image );
- }
- else
- {
- image.SetOpacity( 1.0f );
- }
+ image.SetOpacity( 1.0f );
}
}
actorLayer = image;
- if( checkBox.GetProperty<bool>( checkBox.GetPropertyIndex( Toolkit::CheckBoxButton::USE_FADE_ANIMATION_PROPERTY_NAME ) ) )
- {
- actorLayer.SetOpacity( opacity );
- AddToFadeOutAnimation( actorLayer );
- }
- else
- {
- actorLayer.SetOpacity( 0.0f );
- }
+ actorLayer.SetOpacity( 0.0f );
}
}
// Actor size anim
Handle handle = actor; // Get rid of const
- mCheckInAnimation.AnimateTo( Property( handle, mPercentageParentSizeProperty ), 1.0f );
+ mCheckInAnimation.AnimateTo( Property( handle, Actor::SCALE_X ), 1.0f);
}
void CheckBoxButtonDefaultPainter::SetupCheckedAnimation( Toolkit::CheckBoxButton& checkBox, Actor& image )
{
- if( checkBox.GetProperty<bool>( checkBox.GetPropertyIndex( Toolkit::CheckBoxButton::USE_CHECK_ANIMATION_PROPERTY_NAME ) ) && image )
+ if( image )
{
if( !mTickUVEffect )
{
imageActor.SetShaderEffect( mTickUVEffect );
}
- // Register a custom property to animate size of tick over
- if( mPercentageParentSizeProperty != Property::INVALID_INDEX )
- {
- image.SetProperty( mPercentageParentSizeProperty, 0.0f );
- }
+ image.SetScale( Vector3( 0.0f, 1.0f, 1.0f ) );
mTickUVEffect.SetBottomRight( Vector2( 0.0f, 1.0f ) );
mPaintState = UncheckedState;
break;
}
- case UncheckedDimmedTransition:
+ case UncheckedDisabledTransition:
{
- mPaintState = DimmedUncheckedState;
+ mPaintState = DisabledUncheckedState;
break;
}
- case DimmedUncheckedTransition:
+ case DisabledUncheckedTransition:
{
mPaintState = UncheckedState;
break;
}
- case CheckedDimmedTransition:
+ case CheckedDisabledTransition:
{
- mPaintState = DimmedCheckedState;
+ mPaintState = DisabledCheckedState;
break;
}
- case DimmedCheckedTransition:
+ case DisabledCheckedTransition:
{
mPaintState = CheckedState;
break;
mPaintState = UncheckedState;
break;
}
- case UncheckedDimmedTransition:
+ case UncheckedDisabledTransition:
{
- mPaintState = DimmedUncheckedState;
+ mPaintState = DisabledUncheckedState;
break;
}
- case DimmedUncheckedTransition:
+ case DisabledUncheckedTransition:
{
mPaintState = UncheckedState;
break;
}
- case CheckedDimmedTransition:
+ case CheckedDisabledTransition:
{
- mPaintState = DimmedCheckedState;
+ mPaintState = DisabledCheckedState;
break;
}
- case DimmedCheckedTransition:
+ case DisabledCheckedTransition:
{
mPaintState = CheckedState;
break;
void SetCheckedImage( Toolkit::CheckBoxButton& checkBox, Actor image );
/**
- * Sets the dimmed backgroundimage.
+ * Sets the disabled backgroundimage.
*
- * It adds the dimmed backgroundimage to the root actor and creates the image transition if needed.
+ * It adds the disabled backgroundimage to the root actor and creates the image transition if needed.
*
* @param[inout] checkBox The button in which all actors that form its appearance are going to be added.
- * @param[in] image The dimmed backgroundimage.
+ * @param[in] image The disabled backgroundimage.
*/
- void SetDimmedBackgroundImage( Toolkit::CheckBoxButton& checkBox, Actor image );
+ void SetDisabledBackgroundImage( Toolkit::CheckBoxButton& checkBox, Actor image );
/**
- * Sets the dimmed checked image.
+ * Sets the disabled checked image.
*
- * It adds the dimmed checked image to the root actor and creates the image transition if needed.
+ * It adds the disabled checked image to the root actor and creates the image transition if needed.
*
* @param[inout] checkBox The button in which all actors that form its appearance are going to be added.
- * @param[in] image The dimmed checked image.
+ * @param[in] image The disabled checked image.
*/
- void SetDimmedCheckedImage( Toolkit::CheckBoxButton& checkBox, Actor image );
+ void SetDisabledCheckedImage( Toolkit::CheckBoxButton& checkBox, Actor image );
/////////////////////////////////////////////////////////////////////////////
// ButtonPainter interface
void SetSize( Toolkit::Button& button, const Vector3& size );
/**
- * Changes the Vega::Toolkit::CheckBoxButton for the given dimmed state.
+ * Changes the Vega::Toolkit::CheckBoxButton for the given disabled state.
*
* It creates the image transition if needed.
*
* @param[inout] button The button in which all actors that form its appearance are going to be added.
- * @param[in] dimmed The dimmed state.
+ * @param[in] disabled The disabled state.
*/
- void SetDimmed( Toolkit::Button& button, bool dimmed );
+ void SetDisabled( Toolkit::Button& button, bool disabled );
/**
* Sets the animation time.
*/
enum PaintState
{
- UncheckedState, ///< The check box button is unchecked.
- CheckedState, ///< The check box button is checked.
- DimmedUncheckedState, ///< The check box button is dimmed and unchecked.
- DimmedCheckedState, ///< The check box button is dimmed and checked.
- UncheckedCheckedTransition, ///< The check box button is in transition from unchecked to checked.
- CheckedUncheckedTransition, ///< The check box button is in transition from checked to unchecked.
- UncheckedDimmedTransition, ///< The check box button is in transition from unchecked to dimmed.
- DimmedUncheckedTransition, ///< The check box button is in transition from dimmed to unchecked.
- CheckedDimmedTransition, ///< The check box button is in transition from checked to dimmed.
- DimmedCheckedTransition ///< The check box button is in transition from dimmed to checked.
+ UncheckedState, ///< The check box button is unchecked.
+ CheckedState, ///< The check box button is checked.
+ DisabledUncheckedState, ///< The check box button is disabled and unchecked.
+ DisabledCheckedState, ///< The check box button is disabled and checked.
+ UncheckedCheckedTransition, ///< The check box button is in transition from unchecked to checked.
+ CheckedUncheckedTransition, ///< The check box button is in transition from checked to unchecked.
+ UncheckedDisabledTransition, ///< The check box button is in transition from unchecked to disabled.
+ DisabledUncheckedTransition, ///< The check box button is in transition from disabled to unchecked.
+ CheckedDisabledTransition, ///< The check box button is in transition from checked to disabled.
+ DisabledCheckedTransition ///< The check box button is in transition from disabled to checked.
};
/**
void CheckInAnimationFinished( Dali::Animation& source );
private:
- bool mDimmed; ///< Stores the dimmed property.
+ bool mDisabled; ///< Stores the disabled property.
PaintState mPaintState; ///< The painter state.
void CheckBoxButton::SetChecked( bool checked )
{
- if( !mDimmed && ( checked != mChecked ) )
+ if( !mDisabled && ( checked != mChecked ) )
{
// Stores the state.
mChecked = checked;
// Notifies the painter the checkbox has been checked.
GetCheckBoxButtonPainter( mPainter )->Checked( handle );
- // Raise toggled signal
- mToggledSignalV2.Emit( handle, mChecked );
+ // Raise state changed signal
+ mStateChangedSignal.Emit( handle, mChecked );
}
}
return mCheckedImage;
}
-void CheckBoxButton::SetDimmedBackgroundImage( Image image )
+void CheckBoxButton::SetDisabledBackgroundImage( Image image )
{
- SetDimmedBackgroundImage( ImageActor::New( image ) );
+ SetDisabledBackgroundImage( ImageActor::New( image ) );
}
-void CheckBoxButton::SetDimmedBackgroundImage( Actor image )
+void CheckBoxButton::SetDisabledBackgroundImage( Actor image )
{
Toolkit::CheckBoxButton handle( GetOwner() );
- GetCheckBoxButtonPainter( mPainter )->SetDimmedBackgroundImage( handle, image );
+ GetCheckBoxButtonPainter( mPainter )->SetDisabledBackgroundImage( handle, image );
}
-Actor& CheckBoxButton::GetDimmedBackgroundImage()
+Actor& CheckBoxButton::GetDisabledBackgroundImage()
{
- return mDimmedBackgroundImage;
+ return mDisabledBackgroundImage;
}
-Actor CheckBoxButton::GetDimmedBackgroundImage() const
+Actor CheckBoxButton::GetDisabledBackgroundImage() const
{
- return mDimmedBackgroundImage;
+ return mDisabledBackgroundImage;
}
-void CheckBoxButton::SetDimmedCheckedImage( Image image )
+void CheckBoxButton::SetDisabledCheckedImage( Image image )
{
- SetDimmedCheckedImage( ImageActor::New( image ) );
+ SetDisabledCheckedImage( ImageActor::New( image ) );
}
-void CheckBoxButton::SetDimmedCheckedImage( Actor image )
+void CheckBoxButton::SetDisabledCheckedImage( Actor image )
{
Toolkit::CheckBoxButton handle( GetOwner() );
- GetCheckBoxButtonPainter( mPainter )->SetDimmedCheckedImage( handle, image );
+ GetCheckBoxButtonPainter( mPainter )->SetDisabledCheckedImage( handle, image );
}
-Actor& CheckBoxButton::GetDimmedCheckedImage()
+Actor& CheckBoxButton::GetDisabledCheckedImage()
{
- return mDimmedCheckedImage;
+ return mDisabledCheckedImage;
}
-Actor CheckBoxButton::GetDimmedCheckedImage() const
+Actor CheckBoxButton::GetDisabledCheckedImage() const
{
- return mDimmedCheckedImage;
+ return mDisabledCheckedImage;
}
Actor& CheckBoxButton::GetFadeOutBackgroundImage()
void CheckBoxButton::OnButtonInitialize()
{
- mUseFadeAnimationProperty = Self().RegisterProperty( Toolkit::CheckBoxButton::USE_FADE_ANIMATION_PROPERTY_NAME, false );
- mUseCheckAnimationProperty = Self().RegisterProperty( Toolkit::CheckBoxButton::USE_CHECK_ANIMATION_PROPERTY_NAME, true );
}
void CheckBoxButton::OnButtonUp()
CheckBoxButton::CheckBoxButton()
: Button(),
mChecked( false ),
- mClickActionPerforming(false),
- mUseFadeAnimationProperty(Property::INVALID_INDEX),
- mUseCheckAnimationProperty(Property::INVALID_INDEX)
+ mClickActionPerforming(false)
{
// Creates specific painter.
mPainter = new CheckBoxButtonDefaultPainter();
Actor GetCheckedImage() const;
/**
- * @copydoc Dali::Toolkit::CheckBoxButton::SetDimmedBackgroundImage( Image image )
+ * @copydoc Dali::Toolkit::CheckBoxButton::SetDisabledBackgroundImage( Image image )
*/
- void SetDimmedBackgroundImage( Image image );
+ void SetDisabledBackgroundImage( Image image );
/**
- * @copydoc Dali::Toolkit::CheckBoxButton::SetDimmedBackgroundImage( Actor image )
+ * @copydoc Dali::Toolkit::CheckBoxButton::SetDisabledBackgroundImage( Actor image )
*/
- void SetDimmedBackgroundImage( Actor image );
+ void SetDisabledBackgroundImage( Actor image );
/**
* Used by the painter only.
- * @return A reference to the dimmed background image.
+ * @return A reference to the disabled background image.
*/
- Actor& GetDimmedBackgroundImage();
+ Actor& GetDisabledBackgroundImage();
/**
- * @copydoc Dali::Toolkit::CheckBoxButton::GetDimmedBackgroundImage()
+ * @copydoc Dali::Toolkit::CheckBoxButton::GetDisabledBackgroundImage()
*/
- Actor GetDimmedBackgroundImage() const;
+ Actor GetDisabledBackgroundImage() const;
/**
- * @copydoc Dali::Toolkit::CheckBoxButton::SetDimmedCheckedImage( Image image )
+ * @copydoc Dali::Toolkit::CheckBoxButton::SetDisabledCheckedImage( Image image )
*/
- void SetDimmedCheckedImage( Image image );
+ void SetDisabledCheckedImage( Image image );
/**
- * @copydoc Dali::Toolkit::CheckBoxButton::SetDimmedCheckedImage( Actor image )
+ * @copydoc Dali::Toolkit::CheckBoxButton::SetDisabledCheckedImage( Actor image )
*/
- void SetDimmedCheckedImage( Actor image );
+ void SetDisabledCheckedImage( Actor image );
/**
* Used by the painter only.
- * @return A reference to the dimmed checked image.
+ * @return A reference to the disabled checked image.
*/
- Actor& GetDimmedCheckedImage();
+ Actor& GetDisabledCheckedImage();
/**
- * @copydoc Dali::Toolkit::CheckBoxButton::GetDimmedCheckedImage()
+ * @copydoc Dali::Toolkit::CheckBoxButton::GetDisabledCheckedImage()
*/
- Actor GetDimmedCheckedImage() const;
+ Actor GetDisabledCheckedImage() const;
/**
* Used by the painter only.
Actor mBackgroundImage; ///< Stores the background image.
Actor mCheckedImage; ///< Stores the checked image.
- Actor mDimmedCheckedImage; ///< Stores the dimmed checked image.
- Actor mDimmedBackgroundImage; ///< Stores the dimmed background image.
+ Actor mDisabledCheckedImage; ///< Stores the disabled checked image.
+ Actor mDisabledBackgroundImage; ///< Stores the disabled background image.
Actor mFadeOutBackgroundImage; ///< Stores a background image, which is in a fade out animation, to be removed when the animation finishes.
Actor mFadeOutCheckedImage; ///< Stores a foreground image, which is in a fade out animation, to be removed when the animation finishes.
// Actions
bool mClickActionPerforming;
-
- // Properties
- Property::Index mUseFadeAnimationProperty;
- Property::Index mUseCheckAnimationProperty;
};
} // namespace Internal
virtual void SetSize( Toolkit::Button& button, const Vector3& size ) = 0;
/**
- * @copydoc ButtonPainter::SetDimmed( Toolkit::Button& button, bool dimmed )
+ * @copydoc ButtonPainter::SetDisabled( Toolkit::Button& button, bool disabled )
*/
- virtual void SetDimmed( Toolkit::Button& button, bool dimmed ) = 0;
+ virtual void SetDisabled( Toolkit::Button& button, bool disabled ) = 0;
/**
* @copydoc ButtonPainter::SetAnimationTime()
PushButtonDefaultPainter::PushButtonDefaultPainter()
: PushButtonPainter(),
mAutoRepeating( false ),
- mDimmed( false ),
+ mDisabled( false ),
mPaintState( ReleasedState ),
mButton( NULL ),
mAnimationTime( ANIMATION_TIME ),
break;
}
case ReleasedPressedTransition: // FALLTHROUGH
- case ReleasedDimmedTransition:
+ case ReleasedDisabledTransition:
{
float opacity = 1.f;
if( fadeOutButtonImage )
break;
}
case PressedReleasedTransition: // FALLTHROUGH
- case DimmedReleasedTransition:
+ case DisabledReleasedTransition:
{
StopFadeInAnimation();
pushButton.Remove( buttonImage );
}
break;
}
- case ReleasedDimmedTransition: // FALLTHROUGH
- case PressedDimmedTransition:
+ case ReleasedDisabledTransition: // FALLTHROUGH
+ case PressedDisabledTransition:
{
float opacity = 1.f;
if( fadeOutBackgroundImage )
StartFadeOutAnimation( pushButton );
break;
}
- case DimmedReleasedTransition: // FALLTHROUGH
- case DimmedPressedTransition:
+ case DisabledReleasedTransition: // FALLTHROUGH
+ case DisabledPressedTransition:
{
StopFadeInAnimation();
pushButton.Remove( backgroundImage );
ApplyConstraint( backgroundImage, BACKGROUND_DEPTH );
}
-void PushButtonDefaultPainter::SetPressedImage( Toolkit::PushButton& pushButton, Actor image )
+void PushButtonDefaultPainter::SetSelectedImage( Toolkit::PushButton& pushButton, Actor image )
{
Toolkit::Internal::PushButton& pushButtonImpl = GetImplementation( pushButton );
- Actor& pressedImage = pushButtonImpl.GetPressedImage();
+ Actor& selectedImage = pushButtonImpl.GetSelectedImage();
Actor& fadeOutButtonImage = pushButtonImpl.GetFadeOutButtonImage();
switch( mPaintState )
{
case PressedState:
{
- if( pressedImage && pressedImage.GetParent() )
+ if( selectedImage && selectedImage.GetParent() )
{
StopFadeOutAnimation( pushButton );
- FadeOutImage( pushButton, Foreground, pressedImage );
+ FadeOutImage( pushButton, Foreground, selectedImage );
- pressedImage = image;
+ selectedImage = image;
- FadeInImage( pushButton, pressedImage );
+ FadeInImage( pushButton, selectedImage );
StartFadeOutAnimation( pushButton );
StartFadeInAnimation();
}
else
{
- pressedImage = image;
- pushButton.Add( pressedImage );
+ selectedImage = image;
+ pushButton.Add( selectedImage );
}
break;
}
case PressedReleasedTransition: // FALLTHROUGH
- case PressedDimmedTransition:
+ case PressedDisabledTransition:
{
float opacity = 1.f;
if( fadeOutButtonImage )
StopFadeOutAnimation( pushButton );
// Replaces the button image.
- pressedImage = image;
+ selectedImage = image;
- pushButton.Add( pressedImage );
- FadeOutImage( pushButton, Foreground, pressedImage, opacity );
+ pushButton.Add( selectedImage );
+ FadeOutImage( pushButton, Foreground, selectedImage, opacity );
StartFadeOutAnimation( pushButton );
break;
}
case ReleasedPressedTransition: // FALLTHROUGH
- case DimmedPressedTransition:
+ case DisabledPressedTransition:
{
StopFadeInAnimation();
- pushButton.Remove( pressedImage );
+ pushButton.Remove( selectedImage );
- pressedImage = image;
+ selectedImage = image;
- FadeInImage( pushButton, pressedImage );
+ FadeInImage( pushButton, selectedImage );
StartFadeInAnimation();
break;
}
default:
- pressedImage = image;
+ selectedImage = image;
break;
}
- pressedImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- pressedImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
- ApplyConstraint( pressedImage, FOREGROUND_DEPTH );
+ selectedImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ selectedImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ ApplyConstraint( selectedImage, FOREGROUND_DEPTH );
}
-void PushButtonDefaultPainter::SetDimmedImage( Toolkit::PushButton& pushButton, Actor image )
+void PushButtonDefaultPainter::SetDisabledImage( Toolkit::PushButton& pushButton, Actor image )
{
Toolkit::Internal::PushButton& pushButtonImpl = GetImplementation( pushButton );
- Actor& dimmedImage = pushButtonImpl.GetDimmedImage();
+ Actor& disabledImage = pushButtonImpl.GetDisabledImage();
Actor& fadeOutButtonImage = pushButtonImpl.GetFadeOutButtonImage();
switch( mPaintState )
{
- case DimmedReleasedState: // FALLTHROUGH
- case DimmedPressedState:
+ case DisabledReleasedState: // FALLTHROUGH
+ case DisabledPressedState:
{
- if( dimmedImage && dimmedImage.GetParent() )
+ if( disabledImage && disabledImage.GetParent() )
{
StopFadeOutAnimation( pushButton );
- FadeOutImage( pushButton, Foreground, dimmedImage );
+ FadeOutImage( pushButton, Foreground, disabledImage );
- dimmedImage = image;
+ disabledImage = image;
- FadeInImage( pushButton, dimmedImage );
+ FadeInImage( pushButton, disabledImage );
StartFadeOutAnimation( pushButton );
StartFadeInAnimation();
}
else
{
- dimmedImage = image;
- pushButton.Add( dimmedImage );
+ disabledImage = image;
+ pushButton.Add( disabledImage );
}
break;
}
- case ReleasedDimmedTransition: // FALLTHROUGH
- case PressedDimmedTransition:
+ case ReleasedDisabledTransition: // FALLTHROUGH
+ case PressedDisabledTransition:
{
StopFadeInAnimation();
- pushButton.Remove( dimmedImage );
+ pushButton.Remove( disabledImage );
- dimmedImage = image;
+ disabledImage = image;
- FadeInImage( pushButton, dimmedImage );
+ FadeInImage( pushButton, disabledImage );
StartFadeInAnimation();
break;
}
- case DimmedReleasedTransition: // FALLTHROUGH
- case DimmedPressedTransition:
+ case DisabledReleasedTransition: // FALLTHROUGH
+ case DisabledPressedTransition:
{
float opacity = 1.f;
if( fadeOutButtonImage )
StopFadeOutAnimation( pushButton );
// Replaces the button image.
- dimmedImage = image;
+ disabledImage = image;
- pushButton.Add( dimmedImage );
- FadeOutImage( pushButton, Foreground, dimmedImage, opacity );
+ pushButton.Add( disabledImage );
+ FadeOutImage( pushButton, Foreground, disabledImage, opacity );
StartFadeOutAnimation( pushButton );
break;
}
default:
- dimmedImage = image;
+ disabledImage = image;
break;
}
- dimmedImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- dimmedImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
- ApplyConstraint( dimmedImage, FOREGROUND_DEPTH );
+ disabledImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ disabledImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ ApplyConstraint( disabledImage, FOREGROUND_DEPTH );
}
-void PushButtonDefaultPainter::SetDimmedBackgroundImage( Toolkit::PushButton& pushButton, Actor image )
+void PushButtonDefaultPainter::SetDisabledBackgroundImage( Toolkit::PushButton& pushButton, Actor image )
{
Toolkit::Internal::PushButton& pushButtonImpl = GetImplementation( pushButton );
- Actor& dimmedBackgroundImage = pushButtonImpl.GetDimmedBackgroundImage();
+ Actor& disabledBackgroundImage = pushButtonImpl.GetDisabledBackgroundImage();
Actor& fadeOutBackgroundImage = pushButtonImpl.GetFadeOutBackgroundImage();
switch( mPaintState )
{
- case DimmedReleasedState: // FALLTHROUGH
- case DimmedPressedState:
+ case DisabledReleasedState: // FALLTHROUGH
+ case DisabledPressedState:
{
- if( dimmedBackgroundImage && dimmedBackgroundImage.GetParent() )
+ if( disabledBackgroundImage && disabledBackgroundImage.GetParent() )
{
StopFadeOutAnimation( pushButton );
- FadeOutImage( pushButton, Background, dimmedBackgroundImage );
+ FadeOutImage( pushButton, Background, disabledBackgroundImage );
- dimmedBackgroundImage = image;
+ disabledBackgroundImage = image;
- FadeInImage( pushButton, dimmedBackgroundImage );
+ FadeInImage( pushButton, disabledBackgroundImage );
StartFadeOutAnimation( pushButton );
StartFadeInAnimation();
}
else
{
- dimmedBackgroundImage = image;
- pushButton.Add( dimmedBackgroundImage );
+ disabledBackgroundImage = image;
+ pushButton.Add( disabledBackgroundImage );
}
break;
}
- case ReleasedDimmedTransition: // FALLTHROUGH
- case PressedDimmedTransition:
+ case ReleasedDisabledTransition: // FALLTHROUGH
+ case PressedDisabledTransition:
{
StopFadeInAnimation();
- pushButton.Remove( dimmedBackgroundImage );
+ pushButton.Remove( disabledBackgroundImage );
- dimmedBackgroundImage = image;
+ disabledBackgroundImage = image;
- FadeInImage( pushButton, dimmedBackgroundImage );
+ FadeInImage( pushButton, disabledBackgroundImage );
StartFadeInAnimation();
break;
}
- case DimmedReleasedTransition: // FALLTHROUGH
- case DimmedPressedTransition:
+ case DisabledReleasedTransition: // FALLTHROUGH
+ case DisabledPressedTransition:
{
float opacity = 1.f;
if( fadeOutBackgroundImage )
StopFadeOutAnimation( pushButton );
// Replaces the button image.
- dimmedBackgroundImage = image;
+ disabledBackgroundImage = image;
- pushButton.Add( dimmedBackgroundImage );
- FadeOutImage( pushButton, Background, dimmedBackgroundImage, opacity );
+ pushButton.Add( disabledBackgroundImage );
+ FadeOutImage( pushButton, Background, disabledBackgroundImage, opacity );
StartFadeOutAnimation( pushButton );
break;
}
default:
- dimmedBackgroundImage = image;
+ disabledBackgroundImage = image;
break;
}
- dimmedBackgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- dimmedBackgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
- ApplyConstraint( dimmedBackgroundImage, BACKGROUND_DEPTH );
+ disabledBackgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ disabledBackgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ ApplyConstraint( disabledBackgroundImage, BACKGROUND_DEPTH );
}
-void PushButtonDefaultPainter::SetLabelText( Toolkit::PushButton& pushButton, Actor text )
+void PushButtonDefaultPainter::SetLabel( Toolkit::PushButton& pushButton, Actor label )
{
Toolkit::Internal::PushButton& pushButtonImpl = GetImplementation( pushButton );
- Actor& label = pushButtonImpl.GetLabel();
+ Actor& labelActor = pushButtonImpl.GetLabel();
- if( label && label.GetParent() )
+ if( labelActor && labelActor.GetParent() )
{
- label.GetParent().Remove( label );
+ labelActor.GetParent().Remove( labelActor );
}
- label = text;
- label.SetAnchorPoint( AnchorPoint::CENTER );
- label.SetParentOrigin( ParentOrigin::CENTER );
+ labelActor = label;
+ labelActor.SetAnchorPoint( AnchorPoint::CENTER );
+ labelActor.SetParentOrigin( ParentOrigin::CENTER );
- label.SetPosition( 0.f, 0.f, LABEL_DEPTH );
- label.SetSize( mSize );
+ labelActor.SetPosition( 0.f, 0.f, LABEL_DEPTH );
+ labelActor.SetSize( mSize );
- pushButton.Add( label );
+ pushButton.Add( labelActor );
}
void PushButtonDefaultPainter::Initialize( Toolkit::Button& button )
{
Toolkit::Internal::PushButton& pushButtonImpl = GetPushButtonImpl( button );
Actor& buttonImage = pushButtonImpl.GetButtonImage();
- Actor& pressedImage = pushButtonImpl.GetPressedImage();
+ Actor& selectedImage = pushButtonImpl.GetSelectedImage();
Actor& backgroundImage = pushButtonImpl.GetBackgroundImage();
- Actor& dimmedImage = pushButtonImpl.GetDimmedImage();
- Actor& dimmedBackgroundImage = pushButtonImpl.GetDimmedBackgroundImage();
+ Actor& disabledImage = pushButtonImpl.GetDisabledImage();
+ Actor& disabledBackgroundImage = pushButtonImpl.GetDisabledBackgroundImage();
Actor& label = pushButtonImpl.GetLabel();
Toolkit::PushButton& pushButton = static_cast<Toolkit::PushButton&>( button );
SetBackgroundImage( pushButton, backgroundImage );
}
- if( pressedImage )
+ if( selectedImage )
{
- SetPressedImage( pushButton, pressedImage );
+ SetSelectedImage( pushButton, selectedImage );
}
- if( dimmedImage )
+ if( disabledImage )
{
- SetDimmedImage( pushButton, dimmedImage );
+ SetDisabledImage( pushButton, disabledImage );
}
- if( dimmedBackgroundImage )
+ if( disabledBackgroundImage )
{
- SetDimmedBackgroundImage( pushButton, dimmedBackgroundImage );
+ SetDisabledBackgroundImage( pushButton, disabledBackgroundImage );
}
if( label )
{
- SetLabelText( pushButton, label );
+ SetLabel( pushButton, label );
}
- SetDimmed( pushButton, mDimmed );
+ SetDisabled( pushButton, mDisabled );
}
void PushButtonDefaultPainter::SetSize( Toolkit::Button& button, const Vector3& size )
Toolkit::Internal::PushButton& pushButtonImpl = GetPushButtonImpl( button );
Actor& buttonImage = pushButtonImpl.GetButtonImage();
- Actor& pressedImage = pushButtonImpl.GetPressedImage();
+ Actor& selectedImage = pushButtonImpl.GetSelectedImage();
Actor& backgroundImage = pushButtonImpl.GetBackgroundImage();
- Actor& dimmedImage = pushButtonImpl.GetDimmedImage();
- Actor& dimmedBackgroundImage = pushButtonImpl.GetDimmedBackgroundImage();
+ Actor& disabledImage = pushButtonImpl.GetDisabledImage();
+ Actor& disabledBackgroundImage = pushButtonImpl.GetDisabledBackgroundImage();
Actor& label = pushButtonImpl.GetLabel();
ApplyConstraint( buttonImage, FOREGROUND_DEPTH );
ApplyConstraint( backgroundImage, BACKGROUND_DEPTH );
- ApplyConstraint( pressedImage, FOREGROUND_DEPTH );
- ApplyConstraint( dimmedImage, FOREGROUND_DEPTH );
- ApplyConstraint( dimmedBackgroundImage, BACKGROUND_DEPTH );
+ ApplyConstraint( selectedImage, FOREGROUND_DEPTH );
+ ApplyConstraint( disabledImage, FOREGROUND_DEPTH );
+ ApplyConstraint( disabledBackgroundImage, BACKGROUND_DEPTH );
if( label )
{
}
}
-void PushButtonDefaultPainter::SetDimmed( Toolkit::Button& button, bool dimmed )
+void PushButtonDefaultPainter::SetDisabled( Toolkit::Button& button, bool disabled )
{
Toolkit::Internal::PushButton& pushButtonImpl = GetPushButtonImpl( button );
Actor& buttonImage = pushButtonImpl.GetButtonImage();
- Actor& pressedImage = pushButtonImpl.GetPressedImage();
+ Actor& selectedImage = pushButtonImpl.GetSelectedImage();
Actor& backgroundImage = pushButtonImpl.GetBackgroundImage();
- Actor& dimmedImage = pushButtonImpl.GetDimmedImage();
- Actor& dimmedBackgroundImage = pushButtonImpl.GetDimmedBackgroundImage();
+ Actor& disabledImage = pushButtonImpl.GetDisabledImage();
+ Actor& disabledBackgroundImage = pushButtonImpl.GetDisabledBackgroundImage();
Actor& fadeOutButtonImage = pushButtonImpl.GetFadeOutButtonImage();
Toolkit::PushButton& pushButton = static_cast<Toolkit::PushButton&>( button );
- mDimmed = dimmed;
+ mDisabled = disabled;
switch( mPaintState )
{
case ReleasedState:
{
- if( dimmed )
+ if( disabled )
{
StopFadeOutAnimation( pushButton );
FadeOutImage( pushButton, Background, backgroundImage );
FadeOutImage( pushButton, Foreground, buttonImage );
- FadeInImage( pushButton, dimmedBackgroundImage );
- FadeInImage( pushButton, dimmedImage );
+ FadeInImage( pushButton, disabledBackgroundImage );
+ FadeInImage( pushButton, disabledImage );
StartFadeOutAnimation( pushButton );
StartFadeInAnimation();
- if( buttonImage || dimmedImage || backgroundImage || dimmedBackgroundImage )
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
{
- mPaintState = ReleasedDimmedTransition;
+ mPaintState = ReleasedDisabledTransition;
}
else
{
- mPaintState = DimmedReleasedState;
+ mPaintState = DisabledReleasedState;
}
}
break;
}
case PressedState:
{
- if( dimmed )
+ if( disabled )
{
StopFadeOutAnimation( pushButton );
FadeOutImage( pushButton, Background, backgroundImage );
- FadeOutImage( pushButton, Foreground, pressedImage );
- FadeInImage( pushButton, dimmedBackgroundImage );
- FadeInImage( pushButton, dimmedImage );
+ FadeOutImage( pushButton, Foreground, selectedImage );
+ FadeInImage( pushButton, disabledBackgroundImage );
+ FadeInImage( pushButton, disabledImage );
StartFadeOutAnimation( pushButton );
StartFadeInAnimation();
- if( pressedImage || dimmedImage || backgroundImage || dimmedBackgroundImage )
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
{
- mPaintState = PressedDimmedTransition;
+ mPaintState = PressedDisabledTransition;
}
else
{
- mPaintState = DimmedPressedState;
+ mPaintState = DisabledPressedState;
}
}
break;
}
- case DimmedReleasedState:
+ case DisabledReleasedState:
{
- if( !dimmed )
+ if( !disabled )
{
StopFadeOutAnimation( pushButton );
- FadeOutImage( pushButton, Background, dimmedBackgroundImage );
- FadeOutImage( pushButton, Foreground, dimmedImage );
+ FadeOutImage( pushButton, Background, disabledBackgroundImage );
+ FadeOutImage( pushButton, Foreground, disabledImage );
FadeInImage( pushButton, backgroundImage );
FadeInImage( pushButton, buttonImage );
StartFadeOutAnimation( pushButton );
StartFadeInAnimation();
- if( buttonImage || dimmedImage || backgroundImage || dimmedBackgroundImage )
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
{
- mPaintState = DimmedReleasedTransition;
+ mPaintState = DisabledReleasedTransition;
}
else
{
}
break;
}
- case DimmedPressedState:
+ case DisabledPressedState:
{
- if( !dimmed )
+ if( !disabled )
{
StopFadeOutAnimation( pushButton );
- FadeOutImage( pushButton, Background, dimmedBackgroundImage );
- FadeOutImage( pushButton, Foreground, dimmedImage );
+ FadeOutImage( pushButton, Background, disabledBackgroundImage );
+ FadeOutImage( pushButton, Foreground, disabledImage );
FadeInImage( pushButton, backgroundImage );
- FadeInImage( pushButton, pressedImage );
+ FadeInImage( pushButton, selectedImage );
StartFadeOutAnimation( pushButton );
StartFadeInAnimation();
- if( pressedImage || dimmedImage || backgroundImage || dimmedBackgroundImage )
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
{
- mPaintState = DimmedPressedTransition;
+ mPaintState = DisabledPressedTransition;
}
else
{
}
case ReleasedPressedTransition:
{
- if( dimmed )
+ if( disabled )
{
float opacity = 1.f;
if( fadeOutButtonImage )
StopFadeOutAnimation( pushButton );
StopFadeInAnimation();
- FadeOutImage( pushButton, Foreground, pressedImage, 1.f - opacity );
+ FadeOutImage( pushButton, Foreground, selectedImage, 1.f - opacity );
FadeOutImage( pushButton, Background, backgroundImage );
- FadeInImage( pushButton, dimmedImage );
- FadeInImage( pushButton, dimmedBackgroundImage );
+ FadeInImage( pushButton, disabledImage );
+ FadeInImage( pushButton, disabledBackgroundImage );
StartFadeOutAnimation( pushButton );
StartFadeInAnimation();
- if( pressedImage || dimmedImage || backgroundImage || dimmedBackgroundImage )
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
{
- mPaintState = PressedDimmedTransition;
+ mPaintState = PressedDisabledTransition;
}
else
{
- mPaintState = DimmedPressedState;
+ mPaintState = DisabledPressedState;
}
}
break;
}
case PressedReleasedTransition:
{
- if( dimmed )
+ if( disabled )
{
float opacity = 1.f;
if( fadeOutButtonImage )
FadeOutImage( pushButton, Foreground, buttonImage, 1.f - opacity );
FadeOutImage( pushButton, Background, backgroundImage );
- FadeInImage( pushButton, dimmedImage );
- FadeInImage( pushButton, dimmedBackgroundImage );
+ FadeInImage( pushButton, disabledImage );
+ FadeInImage( pushButton, disabledBackgroundImage );
StartFadeOutAnimation( pushButton );
StartFadeInAnimation();
- if( buttonImage || dimmedImage || backgroundImage || dimmedBackgroundImage )
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
{
- mPaintState = ReleasedDimmedTransition;
+ mPaintState = ReleasedDisabledTransition;
}
else
{
- mPaintState = DimmedReleasedState;
+ mPaintState = DisabledReleasedState;
}
}
break;
}
- case ReleasedDimmedTransition:
+ case ReleasedDisabledTransition:
{
- if( !dimmed )
+ if( !disabled )
{
float opacity = 1.f;
if( fadeOutButtonImage )
StopFadeOutAnimation( pushButton, false );
StopFadeInAnimation();
- FadeOutImage( pushButton, Foreground, dimmedImage, 1.f - opacity );
- FadeOutImage( pushButton, Background, dimmedBackgroundImage, 1.f - opacity );
+ FadeOutImage( pushButton, Foreground, disabledImage, 1.f - opacity );
+ FadeOutImage( pushButton, Background, disabledBackgroundImage, 1.f - opacity );
FadeInImage( pushButton, buttonImage, opacity );
FadeInImage( pushButton, backgroundImage, opacity );
StartFadeOutAnimation( pushButton );
StartFadeInAnimation();
- if( buttonImage || dimmedImage || backgroundImage || dimmedBackgroundImage )
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
{
- mPaintState = DimmedReleasedTransition;
+ mPaintState = DisabledReleasedTransition;
}
else
{
}
break;
}
- case DimmedReleasedTransition:
+ case DisabledReleasedTransition:
{
- if( dimmed )
+ if( disabled )
{
float opacity = 1.f;
if( fadeOutButtonImage )
FadeOutImage( pushButton, Foreground, buttonImage, 1.f - opacity );
FadeOutImage( pushButton, Background, backgroundImage, 1.f - opacity );
- FadeInImage( pushButton, dimmedImage, opacity );
- FadeInImage( pushButton, dimmedBackgroundImage, opacity );
+ FadeInImage( pushButton, disabledImage, opacity );
+ FadeInImage( pushButton, disabledBackgroundImage, opacity );
StartFadeOutAnimation( pushButton );
StartFadeInAnimation();
- if( buttonImage || dimmedImage || backgroundImage || dimmedBackgroundImage )
+ if( buttonImage || disabledImage || backgroundImage || disabledBackgroundImage )
{
- mPaintState = ReleasedDimmedTransition;
+ mPaintState = ReleasedDisabledTransition;
}
else
{
- mPaintState = DimmedReleasedState;
+ mPaintState = DisabledReleasedState;
}
}
break;
}
- case PressedDimmedTransition:
+ case PressedDisabledTransition:
{
- if( !dimmed )
+ if( !disabled )
{
float opacity = 1.f;
if( fadeOutButtonImage )
StopFadeOutAnimation( pushButton, false );
StopFadeInAnimation();
- FadeOutImage( pushButton, Foreground, dimmedImage, 1.f - opacity );
- FadeOutImage( pushButton, Background, dimmedBackgroundImage, 1.f - opacity );
- FadeInImage( pushButton, pressedImage, opacity );
+ FadeOutImage( pushButton, Foreground, disabledImage, 1.f - opacity );
+ FadeOutImage( pushButton, Background, disabledBackgroundImage, 1.f - opacity );
+ FadeInImage( pushButton, selectedImage, opacity );
FadeInImage( pushButton, backgroundImage, opacity );
StartFadeOutAnimation( pushButton );
StartFadeInAnimation();
- if( pressedImage || dimmedImage || backgroundImage || dimmedBackgroundImage )
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
{
- mPaintState = DimmedPressedTransition;
+ mPaintState = DisabledPressedTransition;
}
else
{
}
break;
}
- case DimmedPressedTransition:
+ case DisabledPressedTransition:
{
- if( dimmed )
+ if( disabled )
{
float opacity = 1.f;
if( fadeOutButtonImage )
StopFadeOutAnimation( pushButton, false );
StopFadeInAnimation();
- FadeOutImage( pushButton, Foreground, pressedImage, 1.f - opacity );
+ FadeOutImage( pushButton, Foreground, selectedImage, 1.f - opacity );
FadeOutImage( pushButton, Background, backgroundImage, 1.f - opacity );
- FadeInImage( pushButton, dimmedImage, opacity );
- FadeInImage( pushButton, dimmedBackgroundImage, opacity );
+ FadeInImage( pushButton, disabledImage, opacity );
+ FadeInImage( pushButton, disabledBackgroundImage, opacity );
StartFadeOutAnimation( pushButton );
StartFadeInAnimation();
- if( pressedImage || dimmedImage || backgroundImage || dimmedBackgroundImage )
+ if( selectedImage || disabledImage || backgroundImage || disabledBackgroundImage )
{
- mPaintState = PressedDimmedTransition;
+ mPaintState = PressedDisabledTransition;
}
else
{
- mPaintState = DimmedPressedState;
+ mPaintState = DisabledPressedState;
}
}
break;
void PushButtonDefaultPainter::Pressed( Toolkit::PushButton& button )
{
Toolkit::Internal::PushButton& pushButtonImpl = GetPushButtonImpl( button );
- Actor& pressedImage = pushButtonImpl.GetPressedImage();
+ Actor& selectedImage = pushButtonImpl.GetSelectedImage();
Actor& buttonImage = pushButtonImpl.GetButtonImage();
Actor& fadeOutButtonImage = pushButtonImpl.GetFadeOutButtonImage();
{
StopFadeOutAnimation( button );
FadeOutImage( button, Foreground, buttonImage );
- FadeInImage( button, pressedImage );
+ FadeInImage( button, selectedImage );
StartFadeOutAnimation( button );
StartFadeInAnimation();
- if( buttonImage || pressedImage )
+ if( buttonImage || selectedImage )
{
mPaintState = ReleasedPressedTransition;
}
StopFadeInAnimation();
FadeOutImage( button, Foreground, buttonImage, 1.f - opacity );
- FadeInImage( button, pressedImage, opacity );
+ FadeInImage( button, selectedImage, opacity );
StartFadeOutAnimation( button );
StartFadeInAnimation();
- if( buttonImage || pressedImage )
+ if( buttonImage || selectedImage )
{
mPaintState = ReleasedPressedTransition;
}
void PushButtonDefaultPainter::Released( Toolkit::PushButton& button )
{
Toolkit::Internal::PushButton& pushButtonImpl = GetPushButtonImpl( button );
- Actor& pressedImage = pushButtonImpl.GetPressedImage();
+ Actor& selectedImage = pushButtonImpl.GetSelectedImage();
Actor& buttonImage = pushButtonImpl.GetButtonImage();
Actor& fadeOutButtonImage = pushButtonImpl.GetFadeOutButtonImage();
case PressedState:
{
StopFadeOutAnimation( button );
- FadeOutImage( button, Foreground, pressedImage );
+ FadeOutImage( button, Foreground, selectedImage );
FadeInImage( button, buttonImage );
StartFadeOutAnimation( button );
StartFadeInAnimation();
- if( buttonImage || pressedImage )
+ if( buttonImage || selectedImage )
{
mPaintState = PressedReleasedTransition;
}
StopFadeOutAnimation( button, false );
StopFadeInAnimation();
- FadeOutImage( button, Foreground, pressedImage, 1.f - opacity );
+ FadeOutImage( button, Foreground, selectedImage, 1.f - opacity );
FadeInImage( button, buttonImage, opacity );
StartFadeOutAnimation( button );
StartFadeInAnimation();
- if( buttonImage || pressedImage )
+ if( buttonImage || selectedImage )
{
mPaintState = PressedReleasedTransition;
}
void PushButtonDefaultPainter::Toggled( Toolkit::PushButton& button )
{
Toolkit::Internal::PushButton& pushButtonImpl = GetPushButtonImpl( button );
- Actor& pressedImage = pushButtonImpl.GetPressedImage();
+ Actor& selectedImage = pushButtonImpl.GetSelectedImage();
Actor& buttonImage = pushButtonImpl.GetButtonImage();
Actor& fadeOutButtonImage = pushButtonImpl.GetFadeOutButtonImage();
{
StopFadeOutAnimation( button );
FadeOutImage( button, Foreground, buttonImage );
- FadeInImage( button, pressedImage );
+ FadeInImage( button, selectedImage );
StartFadeOutAnimation( button );
StartFadeInAnimation();
- if( buttonImage || pressedImage )
+ if( buttonImage || selectedImage )
{
mPaintState = ReleasedPressedTransition;
}
case PressedState:
{
StopFadeOutAnimation( button );
- FadeOutImage( button, Foreground, pressedImage );
+ FadeOutImage( button, Foreground, selectedImage );
FadeInImage( button, buttonImage );
StartFadeOutAnimation( button );
StartFadeInAnimation();
- if( buttonImage || pressedImage )
+ if( buttonImage || selectedImage )
{
mPaintState = PressedReleasedTransition;
}
StopFadeOutAnimation( button, false );
StopFadeInAnimation();
- FadeOutImage( button, Foreground, pressedImage, 1.f - opacity );
+ FadeOutImage( button, Foreground, selectedImage, 1.f - opacity );
FadeInImage( button, buttonImage, opacity );
StartFadeOutAnimation( button );
StartFadeInAnimation();
- if( buttonImage || pressedImage )
+ if( buttonImage || selectedImage )
{
mPaintState = PressedReleasedTransition;
}
StopFadeInAnimation();
FadeOutImage( button, Foreground, buttonImage, 1.f - opacity );
- FadeInImage( button, pressedImage, opacity );
+ FadeInImage( button, selectedImage, opacity );
StartFadeOutAnimation( button );
StartFadeInAnimation();
- if( buttonImage || pressedImage )
+ if( buttonImage || selectedImage )
{
mPaintState = ReleasedPressedTransition;
}
mPaintState = ReleasedState;
break;
}
- case ReleasedDimmedTransition:
+ case ReleasedDisabledTransition:
{
- mPaintState = DimmedReleasedState;
+ mPaintState = DisabledReleasedState;
break;
}
- case DimmedReleasedTransition:
+ case DisabledReleasedTransition:
{
mPaintState = ReleasedState;
break;
}
- case PressedDimmedTransition:
+ case PressedDisabledTransition:
{
- mPaintState = DimmedPressedState;
+ mPaintState = DisabledPressedState;
break;
}
- case DimmedPressedTransition:
+ case DisabledPressedTransition:
{
mPaintState = PressedState;
break;
mPaintState = ReleasedState;
break;
}
- case ReleasedDimmedTransition:
+ case ReleasedDisabledTransition:
{
- mPaintState = DimmedReleasedState;
+ mPaintState = DisabledReleasedState;
break;
}
- case DimmedReleasedTransition:
+ case DisabledReleasedTransition:
{
mPaintState = ReleasedState;
break;
}
- case PressedDimmedTransition:
+ case PressedDisabledTransition:
{
- mPaintState = DimmedPressedState;
+ mPaintState = DisabledPressedState;
break;
}
- case DimmedPressedTransition:
+ case DisabledPressedTransition:
{
mPaintState = PressedState;
break;
void SetBackgroundImage( Toolkit::PushButton& pushButton, Actor image );
/**
- * Sets the pressed image.
+ * Sets the selected image.
*
- * It adds the pressed image to the root actor and creates the image transition if needed.
+ * It adds the selected image to the root actor and creates the image transition if needed.
*
* @param[inout] pushButton The button in which all actors that form its appearance are going to be added.
- * @param[in] image The pressed image.
+ * @param[in] image The selected image.
*/
- void SetPressedImage( Toolkit::PushButton& pushButton, Actor image );
+ void SetSelectedImage( Toolkit::PushButton& pushButton, Actor image );
/**
- * Sets the dimmed background image.
+ * Sets the disabled background image.
*
- * It adds the dimmed background image to the root actor and creates the image transition if needed.
+ * It adds the disabled background image to the root actor and creates the image transition if needed.
*
* @param[inout] pushButton The button in which all actors that form its appearance are going to be added.
- * @param[in] image The dimmed background image.
+ * @param[in] image The disabled background image.
*/
- void SetDimmedBackgroundImage( Toolkit::PushButton& pushButton, Actor image );
+ void SetDisabledBackgroundImage( Toolkit::PushButton& pushButton, Actor image );
/**
- * Sets the dimmed image.
+ * Sets the disabled image.
*
- * It adds the dimmed image to the root actor and creates the image transition if needed.
+ * It adds the disabled image to the root actor and creates the image transition if needed.
*
* @param[inout] pushButton The button in which all actors that form its appearance are going to be added.
* @param[in] image The image.
*/
- void SetDimmedImage( Toolkit::PushButton& pushButton, Actor image );
+ void SetDisabledImage( Toolkit::PushButton& pushButton, Actor image );
/**
- * Sets the text label.
+ * Sets the label.
*
- * It adds the text to the root actor.
+ * It adds the label to the root actor.
*
* @param[inout] pushButton The button in which all actors that form its appearance are going to be added.
- * @param[in] text Label text.
+ * @param[in] label Button label.
*/
- void SetLabelText( Toolkit::PushButton& pushButton, Actor text );
+ void SetLabel( Toolkit::PushButton& pushButton, Actor label );
/////////////////////////////////////////////////////////////////////////////
// ButtonPainter interface
void SetSize( Toolkit::Button& button, const Vector3& size );
/**
- * This method is called when the \e dimmed property in the Dali::Toolkit::PushButton changes.
+ * This method is called when the \e disabled property in the Dali::Toolkit::PushButton changes.
*
* Creates image transitions if needed.
*
* @param[inout] button The button in which all actors that form its appearance are going to be added.
- * @param[in] dimmed property.
+ * @param[in] disabled property.
*/
- void SetDimmed( Toolkit::Button& button, bool dimmed );
+ void SetDisabled( Toolkit::Button& button, bool disabled );
/**
* Sets the animation time.
/**
* This method is called when the Dali::Toolkit::Internal::PushButton in which this object is registered
- * is pressed. It changes to the pressed image with a transition.
+ * is pressed. It changes to the selected image with a transition.
*
* @param[inout] button The Dali::Toolkit::PushButton in which this object is registered.
*/
*/
enum PaintState
{
- ReleasedState, ///< The push button is released.
- PressedState, ///< The push button is pressed.
- DimmedReleasedState, ///< The push button is dimmed and released.
- DimmedPressedState, ///< The push button is dimemd and pressed.
- ReleasedPressedTransition, ///< The push button is in transition from released to pressed.
- PressedReleasedTransition, ///< The push button is in transition from pressed to released.
- ReleasedDimmedTransition, ///< The push button is in transition from released to dimmed.
- DimmedReleasedTransition, ///< The push button is in transition from dimmed to released.
- PressedDimmedTransition, ///< The push button is in transition from pressed to dimmed.
- DimmedPressedTransition ///< The push button is in transition from dimmed to pressed.
+ ReleasedState, ///< The push button is released.
+ PressedState, ///< The push button is pressed.
+ DisabledReleasedState, ///< The push button is disabled and released.
+ DisabledPressedState, ///< The push button is Disabled and pressed.
+ ReleasedPressedTransition, ///< The push button is in transition from released to pressed.
+ PressedReleasedTransition, ///< The push button is in transition from pressed to released.
+ ReleasedDisabledTransition, ///< The push button is in transition from released to disabled.
+ DisabledReleasedTransition, ///< The push button is in transition from disabled to released.
+ PressedDisabledTransition, ///< The push button is in transition from pressed to disabled.
+ DisabledPressedTransition ///< The push button is in transition from disabled to pressed.
};
/**
private:
bool mAutoRepeating; ///< Stores the autorepeating property.
- bool mDimmed; ///< Stores the dimmed property.
+ bool mDisabled; ///< Stores the disabled property.
PaintState mPaintState; ///< The painter state.
Animation mFadeInAnimation; ///< Animation used in the state transitions.
namespace Toolkit
{
-const Property::Index PushButton::PROPERTY_AUTO_REPEATING = Internal::Button::BUTTON_PROPERTY_END_INDEX + 1;
-const Property::Index PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY = Internal::Button::BUTTON_PROPERTY_END_INDEX + 2;
-const Property::Index PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY = Internal::Button::BUTTON_PROPERTY_END_INDEX + 3;
-const Property::Index PushButton::PROPERTY_TOGGLABLE = Internal::Button::BUTTON_PROPERTY_END_INDEX + 4;
-const Property::Index PushButton::PROPERTY_TOGGLE = Internal::Button::BUTTON_PROPERTY_END_INDEX + 5;
-const Property::Index PushButton::PROPERTY_NORMAL_STATE_ACTOR = Internal::Button::BUTTON_PROPERTY_END_INDEX + 6;
-const Property::Index PushButton::PROPERTY_PRESSED_STATE_ACTOR = Internal::Button::BUTTON_PROPERTY_END_INDEX + 7;
-const Property::Index PushButton::PROPERTY_DIMMED_STATE_ACTOR = Internal::Button::BUTTON_PROPERTY_END_INDEX + 8;
-const Property::Index PushButton::PROPERTY_LABEL_ACTOR = Internal::Button::BUTTON_PROPERTY_END_INDEX + 9;
-
namespace Internal
{
TypeAction action1( typeRegistration, Toolkit::PushButton::ACTION_PUSH_BUTTON_CLICK, &PushButton::DoAction );
-PropertyRegistration property1( typeRegistration, "auto-repeating", Toolkit::PushButton::PROPERTY_AUTO_REPEATING, Property::BOOLEAN, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property2( typeRegistration, "initial-auto-repeating-delay", Toolkit::PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY, Property::FLOAT, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property3( typeRegistration, "next-auto-repeating-delay", Toolkit::PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY, Property::FLOAT, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property4( typeRegistration, "togglable", Toolkit::PushButton::PROPERTY_TOGGLABLE, Property::BOOLEAN, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property5( typeRegistration, "toggle", Toolkit::PushButton::PROPERTY_TOGGLE, Property::BOOLEAN, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property6( typeRegistration, "normal-state-actor", Toolkit::PushButton::PROPERTY_NORMAL_STATE_ACTOR, Property::MAP, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property7( typeRegistration, "pressed-state-actor", Toolkit::PushButton::PROPERTY_PRESSED_STATE_ACTOR, Property::MAP, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property8( typeRegistration, "dimmed-state-actor", Toolkit::PushButton::PROPERTY_DIMMED_STATE_ACTOR, Property::MAP, &PushButton::SetProperty, &PushButton::GetProperty );
-PropertyRegistration property9( typeRegistration, "label-actor", Toolkit::PushButton::PROPERTY_LABEL_ACTOR, Property::MAP, &PushButton::SetProperty, &PushButton::GetProperty );
-
} // unnamed namespace
namespace
void PushButton::SetToggled( bool toggle )
{
- if( !mDimmed && mToggleButton && ( toggle != mToggled ) )
+ if( !mDisabled && mToggleButton && ( toggle != mToggled ) )
{
mToggled = toggle;
GetPushButtonPainter( mPainter )->Toggled( handle );
// Emit signal.
- mToggledSignalV2.Emit( handle, mToggled );
+ mStateChangedSignal.Emit( handle, mToggled );
}
}
return mBackgroundImage;
}
-void PushButton::SetPressedImage( Image image )
+void PushButton::SetSelectedImage( Image image )
{
- SetPressedImage( ImageActor::New( image ) );
+ SetSelectedImage( ImageActor::New( image ) );
}
-void PushButton::SetPressedImage( Actor image )
+void PushButton::SetSelectedImage( Actor image )
{
Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->SetPressedImage( handle, image );
+ GetPushButtonPainter( mPainter )->SetSelectedImage( handle, image );
}
-Actor& PushButton::GetPressedImage()
+Actor& PushButton::GetSelectedImage()
{
- return mPressedImage;
+ return mSelectedImage;
}
-Actor PushButton::GetPressedImage() const
+Actor PushButton::GetSelectedImage() const
{
- return mPressedImage;
+ return mSelectedImage;
}
-void PushButton::SetDimmedBackgroundImage( Image image )
+void PushButton::SetDisabledBackgroundImage( Image image )
{
- SetDimmedBackgroundImage( ImageActor::New( image ) );
+ SetDisabledBackgroundImage( ImageActor::New( image ) );
}
-void PushButton::SetDimmedBackgroundImage( Actor image )
+void PushButton::SetDisabledBackgroundImage( Actor image )
{
Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->SetDimmedBackgroundImage( handle, image );
+ GetPushButtonPainter( mPainter )->SetDisabledBackgroundImage( handle, image );
}
-Actor& PushButton::GetDimmedBackgroundImage()
+Actor& PushButton::GetDisabledBackgroundImage()
{
- return mDimmedBackgroundImage;
+ return mDisabledBackgroundImage;
}
-Actor PushButton::GetDimmedBackgroundImage() const
+Actor PushButton::GetDisabledBackgroundImage() const
{
- return mDimmedBackgroundImage;
+ return mDisabledBackgroundImage;
}
-void PushButton::SetDimmedImage( Image image )
+void PushButton::SetDisabledImage( Image image )
{
- SetDimmedImage( ImageActor::New( image ) );
+ SetDisabledImage( ImageActor::New( image ) );
}
-void PushButton::SetDimmedImage( Actor image )
+void PushButton::SetDisabledImage( Actor image )
{
Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->SetDimmedImage( handle, image );
+ GetPushButtonPainter( mPainter )->SetDisabledImage( handle, image );
}
-Actor& PushButton::GetDimmedImage()
+Actor& PushButton::GetDisabledImage()
{
- return mDimmedImage;
+ return mDisabledImage;
}
-Actor PushButton::GetDimmedImage() const
+Actor PushButton::GetDisabledImage() const
{
- return mDimmedImage;
+ return mDisabledImage;
}
-void PushButton::SetLabelText( const std::string& text )
+void PushButton::SetLabel( const std::string& label )
{
// TODO
}
-void PushButton::SetLabelText( Actor text )
+void PushButton::SetLabel( Actor label )
{
Toolkit::PushButton handle( GetOwner() );
- GetPushButtonPainter( mPainter )->SetLabelText( handle, text );
+ GetPushButtonPainter( mPainter )->SetLabel( handle, label );
}
-Actor& PushButton::GetLabel()
+Actor PushButton::GetLabel() const
{
return mLabel;
}
-Actor PushButton::GetLabelText() const
+Actor& PushButton::GetLabel()
{
return mLabel;
}
return mFadeOutButtonImage;
}
-Toolkit::PushButton::PressedSignalV2& PushButton::PressedSignal()
+Toolkit::PushButton::PressedSignalType& PushButton::PressedSignal()
{
- return mPressedSignalV2;
+ return mPressedSignal;
}
-Toolkit::PushButton::ReleasedSignalV2& PushButton::ReleasedSignal()
+Toolkit::PushButton::ReleasedSignalType& PushButton::ReleasedSignal()
{
- return mReleasedSignalV2;
+ return mReleasedSignal;
}
bool PushButton::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
bool connected( true );
Toolkit::PushButton button = Toolkit::PushButton::DownCast(handle);
- if( Toolkit::PushButton::SIGNAL_TOGGLED == signalName )
+ if( Toolkit::PushButton::SIGNAL_STATE_CHANGED == signalName )
{
- button.ToggledSignal().Connect( tracker, functor );
+ button.StateChangedSignal().Connect( tracker, functor );
}
else if( Toolkit::PushButton::SIGNAL_PRESSED == signalName )
{
{
PushButton& pushButtonImpl( GetImplementation( pushButton ) );
- switch ( propertyIndex )
+ if ( propertyIndex == Toolkit::Button::PROPERTY_AUTO_REPEATING )
{
- case Toolkit::PushButton::PROPERTY_AUTO_REPEATING:
- {
- pushButtonImpl.SetAutoRepeating( value.Get< bool >() );
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY:
- {
- pushButtonImpl.SetInitialAutoRepeatingDelay( value.Get< float >() );
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY:
- {
- pushButtonImpl.SetNextAutoRepeatingDelay( value.Get< float >() );
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_TOGGLABLE:
- {
- pushButtonImpl.SetToggleButton( value.Get< bool >() );
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_TOGGLE:
- {
- pushButtonImpl.SetToggled( value.Get< bool >() );
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_NORMAL_STATE_ACTOR:
- {
- pushButtonImpl.SetButtonImage( Scripting::NewActor( value.Get< Property::Map >() ) );
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_PRESSED_STATE_ACTOR:
- {
- pushButtonImpl.SetPressedImage( Scripting::NewActor( value.Get< Property::Map >() ) );
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_DIMMED_STATE_ACTOR:
- {
- pushButtonImpl.SetDimmedImage( Scripting::NewActor( value.Get< Property::Map >() ) );
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_LABEL_ACTOR:
- {
- pushButtonImpl.SetLabelText( Scripting::NewActor( value.Get< Property::Map >() ) );
- break;
- }
+ pushButtonImpl.SetAutoRepeating( value.Get< bool >() );
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_INITIAL_AUTO_REPEATING_DELAY )
+ {
+ pushButtonImpl.SetInitialAutoRepeatingDelay( value.Get< float >() );
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_NEXT_AUTO_REPEATING_DELAY )
+ {
+ pushButtonImpl.SetNextAutoRepeatingDelay( value.Get< float >() );
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLABLE )
+ {
+ pushButtonImpl.SetToggleButton( value.Get< bool >() );
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLED )
+ {
+ pushButtonImpl.SetToggled( value.Get< bool >() );
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_NORMAL_STATE_ACTOR )
+ {
+ pushButtonImpl.SetButtonImage( Scripting::NewActor( value.Get< Property::Map >() ) );
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_SELECTED_STATE_ACTOR )
+ {
+ pushButtonImpl.SetSelectedImage( Scripting::NewActor( value.Get< Property::Map >() ) );
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_DISABLED_STATE_ACTOR )
+ {
+ pushButtonImpl.SetDisabledImage( Scripting::NewActor( value.Get< Property::Map >() ) );
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_LABEL_ACTOR )
+ {
+ pushButtonImpl.SetLabel( Scripting::NewActor( value.Get< Property::Map >() ) );
}
}
}
{
PushButton& pushButtonImpl( GetImplementation( pushButton ) );
- switch ( propertyIndex )
+ if ( propertyIndex == Toolkit::Button::PROPERTY_AUTO_REPEATING )
{
- case Toolkit::PushButton::PROPERTY_AUTO_REPEATING:
- {
- value = pushButtonImpl.mAutoRepeating;
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY:
- {
- value = pushButtonImpl.mInitialAutoRepeatingDelay;
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY:
- {
- value = pushButtonImpl.mNextAutoRepeatingDelay;
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_TOGGLABLE:
- {
- value = pushButtonImpl.mToggleButton;
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_TOGGLE:
- {
- value = pushButtonImpl.mToggled;
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_NORMAL_STATE_ACTOR:
- {
- Property::Map map;
- Scripting::CreatePropertyMap( pushButtonImpl.mButtonImage, map );
- value = map;
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_PRESSED_STATE_ACTOR:
- {
- Property::Map map;
- Scripting::CreatePropertyMap( pushButtonImpl.mPressedImage, map );
- value = map;
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_DIMMED_STATE_ACTOR:
- {
- Property::Map map;
- Scripting::CreatePropertyMap( pushButtonImpl.mDimmedImage, map );
- value = map;
- break;
- }
-
- case Toolkit::PushButton::PROPERTY_LABEL_ACTOR:
- {
- Property::Map map;
- Scripting::CreatePropertyMap( pushButtonImpl.mLabel, map );
- value = map;
- break;
- }
+ value = pushButtonImpl.mAutoRepeating;
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_INITIAL_AUTO_REPEATING_DELAY )
+ {
+ value = pushButtonImpl.mInitialAutoRepeatingDelay;
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_NEXT_AUTO_REPEATING_DELAY )
+ {
+ value = pushButtonImpl.mNextAutoRepeatingDelay;
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLABLE )
+ {
+ value = pushButtonImpl.mToggleButton;
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLED )
+ {
+ value = pushButtonImpl.mToggled;
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_NORMAL_STATE_ACTOR )
+ {
+ Property::Map map;
+ Scripting::CreatePropertyMap( pushButtonImpl.mButtonImage, map );
+ value = map;
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_SELECTED_STATE_ACTOR )
+ {
+ Property::Map map;
+ Scripting::CreatePropertyMap( pushButtonImpl.mSelectedImage, map );
+ value = map;
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_DISABLED_STATE_ACTOR )
+ {
+ Property::Map map;
+ Scripting::CreatePropertyMap( pushButtonImpl.mDisabledImage, map );
+ value = map;
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_LABEL_ACTOR )
+ {
+ Property::Map map;
+ Scripting::CreatePropertyMap( pushButtonImpl.mLabel, map );
+ value = map;
}
}
}
//Emit signal.
- mPressedSignalV2.Emit( handle );
+ mPressedSignal.Emit( handle );
}
}
GetPushButtonPainter( mPainter )->Toggled( handle );
// Emit signal.
- mToggledSignalV2.Emit( handle, mToggled );
+ mStateChangedSignal.Emit( handle, mToggled );
}
else
{
}
//Emit signal.
- mReleasedSignalV2.Emit( handle );
- mClickedSignalV2.Emit( handle );
+ mReleasedSignal.Emit( handle );
+ mClickedSignal.Emit( handle );
}
}
}
}
//Emit signal.
- mReleasedSignalV2.Emit( handle );
+ mReleasedSignal.Emit( handle );
}
}
}
bool PushButton::AutoRepeatingSlot()
{
bool consumed = false;
- if( !mDimmed )
+ if( !mDisabled )
{
// Restart the autorepeat timer.
SetUpTimer( mNextAutoRepeatingDelay );
GetPushButtonPainter( mPainter )->Pressed( handle );
//Emit signal.
- consumed = mReleasedSignalV2.Emit( handle );
- consumed |= mClickedSignalV2.Emit( handle );
- consumed |= mPressedSignalV2.Emit( handle );
+ consumed = mReleasedSignal.Emit( handle );
+ consumed |= mClickedSignal.Emit( handle );
+ consumed |= mPressedSignal.Emit( handle );
}
return consumed;
Actor GetBackgroundImage() const;
/**
- * @copydoc Dali::Toolkit::PushButton::SetPressedImage( const Image image )
+ * @copydoc Dali::Toolkit::PushButton::SetSelectedImage( const Image image )
*/
- void SetPressedImage( Image image );
+ void SetSelectedImage( Image image );
/**
- * @copydoc Dali::Toolkit::PushButton::SetPressedImage( Actor image )
+ * @copydoc Dali::Toolkit::PushButton::SetSelectedImage( Actor image )
*/
- void SetPressedImage( Actor image );
+ void SetSelectedImage( Actor image );
/**
* Used by the painter only.
- * @return A reference to the pressed image.
+ * @return A reference to the selected image.
*/
- Actor& GetPressedImage();
+ Actor& GetSelectedImage();
/**
- * @copydoc Dali::Toolkit::PushButton::GetPressedImage()
+ * @copydoc Dali::Toolkit::PushButton::GetSelectedImage()
*/
- Actor GetPressedImage() const;
+ Actor GetSelectedImage() const;
/**
- * @copydoc Dali::Toolkit::PushButton::SetDimmedBackgroundImage( Image image )
+ * @copydoc Dali::Toolkit::PushButton::SetDisabledBackgroundImage( Image image )
*/
- void SetDimmedBackgroundImage( Image image );
+ void SetDisabledBackgroundImage( Image image );
/**
- * @copydoc Dali::Toolkit::PushButton::SetDimmedBackgroundImage( Actor image )
+ * @copydoc Dali::Toolkit::PushButton::SetDisabledBackgroundImage( Actor image )
*/
- void SetDimmedBackgroundImage( Actor image );
+ void SetDisabledBackgroundImage( Actor image );
/**
* Used by the painter only.
- * @return A reference to the dimmed background image.
+ * @return A reference to the disabled background image.
*/
- Actor& GetDimmedBackgroundImage();
+ Actor& GetDisabledBackgroundImage();
/**
- * @copydoc Dali::Toolkit::PushButton::GetDimmedBackgroundImage()
+ * @copydoc Dali::Toolkit::PushButton::GetDisabledBackgroundImage()
*/
- Actor GetDimmedBackgroundImage() const;
+ Actor GetDisabledBackgroundImage() const;
/**
- * @copydoc Dali::Toolkit::PushButton::SetDimmedImage( Image image )
+ * @copydoc Dali::Toolkit::PushButton::SetDisabledImage( Image image )
*/
- void SetDimmedImage( Image image );
+ void SetDisabledImage( Image image );
/**
- * @copydoc Dali::Toolkit::PushButton::SetDimmedImage( Actor image )
+ * @copydoc Dali::Toolkit::PushButton::SetDisabledImage( Actor image )
*/
- void SetDimmedImage( Actor image );
+ void SetDisabledImage( Actor image );
/**
* Used by the painter only.
- * @return A reference to the dimmed button image.
+ * @return A reference to the disabled button image.
*/
- Actor& GetDimmedImage();
+ Actor& GetDisabledImage();
/**
- * @copydoc Dali::Toolkit::PushButton::GetDimmedImage()
+ * @copydoc Dali::Toolkit::PushButton::GetDisabledImage()
*/
- Actor GetDimmedImage() const;
+ Actor GetDisabledImage() const;
/**
- * @copydoc Dali::Toolkit::PushButton::SetLabelText( const std::string& text )
+ * @copydoc Dali::Toolkit::PushButton::SetLabel( const std::string& label )
*/
- void SetLabelText( const std::string& text );
+ void SetLabel( const std::string& label );
/**
- * @copydoc Dali::Toolkit::PushButton::SetLabelText( Actor text )
+ * @copydoc Dali::Toolkit::PushButton::SetLabel( Actor label )
*/
- void SetLabelText( Actor text );
+ void SetLabel( Actor label );
/**
- * Used by the painter only.
- * @return A reference to the label actor.
+ * @copydoc Dali::Toolkit::PushButton::GetLabel()
*/
- Actor& GetLabel();
+ Actor GetLabel() const;
/**
- * @copydoc Dali::Toolkit::PushButton::GetLabelText()
+ * Used by the painter only.
+ * @return A reference to the label actor.
*/
- Actor GetLabelText() const;
+ Actor& GetLabel();
/**
* Used by the painter only.
/**
* @copydoc Dali::Toolkit::PushButton::PressedSignal()
*/
- Toolkit::PushButton::PressedSignalV2& PressedSignal();
+ Toolkit::PushButton::PressedSignalType& PressedSignal();
/**
* @copydoc Dali::Toolkit::PushButton::ReleasedSignal()
*/
- Toolkit::PushButton::ReleasedSignalV2& ReleasedSignal();
+ Toolkit::PushButton::ReleasedSignalType& ReleasedSignal();
/**
* Connects a callback function with the object's signals.
bool mToggled; ///< Stores the toggle state.
// Signals
- Toolkit::PushButton::PressedSignalV2 mPressedSignalV2; ///< Signal emitted when the button is pressed.
- Toolkit::PushButton::ReleasedSignalV2 mReleasedSignalV2; ///< Signal emitted when the button is released.
+ Toolkit::PushButton::PressedSignalType mPressedSignal; ///< Signal emitted when the button is pressed.
+ Toolkit::PushButton::ReleasedSignalType mReleasedSignal; ///< Signal emitted when the button is released.
- Actor mButtonImage; ///< Stores the released image.
+ Actor mButtonImage; ///< Stores the unselected image.
Actor mBackgroundImage; ///< Stores the background image.
- Actor mPressedImage; ///< Stores the pressed image.
- Actor mDimmedImage; ///< Stores the dimmed image.
- Actor mDimmedBackgroundImage; ///< Stores the dimmed background image.
+ Actor mSelectedImage; ///< Stores the selected image.
+ Actor mDisabledImage; ///< Stores the disabled image.
+ Actor mDisabledBackgroundImage; ///< Stores the disabled background image.
Actor mLabel; ///< Stores the text label.
virtual void SetSize( Toolkit::Button& button, const Vector3& size ) = 0;
/**
- * @copydoc ButtonPainter::SetDimmed( Toolkit::Button& button, bool dimmed )
+ * @copydoc ButtonPainter::SetDisabled( Toolkit::Button& button, bool disabled )
*/
- virtual void SetDimmed( Toolkit::Button& button, bool dimmed ) = 0;
+ virtual void SetDisabled( Toolkit::Button& button, bool disabled ) = 0;
/**
* @copydoc ButtonPainter::SetAnimationTime()
using namespace Dali;
using namespace Dali::Toolkit::Internal;
-namespace Dali
-{
-namespace Toolkit
-{
-const Property::Index RadioButton::PROPERTY_ACTIVE = Internal::Button::BUTTON_PROPERTY_END_INDEX + 11;
-const Property::Index RadioButton::PROPERTY_LABEL_ACTOR = Internal::Button::BUTTON_PROPERTY_END_INDEX + 12;
-}
-}
-
namespace
{
TypeRegistration typeRegistration( typeid( Toolkit::RadioButton ), typeid( Toolkit::Button ), Create);
-PropertyRegistration property1(typeRegistration, "active", Toolkit::RadioButton::PROPERTY_ACTIVE, Property::BOOLEAN, &RadioButton::SetProperty, &RadioButton::GetProperty);
-PropertyRegistration property2(typeRegistration, "label-actor", Toolkit::RadioButton::PROPERTY_LABEL_ACTOR, Property::MAP, &RadioButton::SetProperty, &RadioButton::GetProperty);
-
-const char* const INACTIVE_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "radio-button-inactive.png";
-const char* const ACTIVE_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "radio-button-active.png";
+const char* const UNSELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "radio-button-unselected.png";
+const char* const SELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "radio-button-selected.png";
const Vector3 DISTANCE_BETWEEN_IMAGE_AND_LABEL(5.0f, 0.0f, 0.0f);
}
}
RadioButton::RadioButton()
- : mActive(false)
+ : mSelected(false)
{
- mInactiveImage = Dali::Image::New( INACTIVE_BUTTON_IMAGE_DIR );
- mActiveImage = Dali::Image::New( ACTIVE_BUTTON_IMAGE_DIR );
+ mUnselectedImage = Dali::Image::New( UNSELECTED_BUTTON_IMAGE_DIR );
+ mSelectedImage = Dali::Image::New( SELECTED_BUTTON_IMAGE_DIR );
- mRadioIcon = Dali::ImageActor::New( mInactiveImage );
+ mRadioIcon = Dali::ImageActor::New( mUnselectedImage );
}
RadioButton::~RadioButton()
return mLabel;
}
-void RadioButton::SetActive(bool active)
+void RadioButton::SetSelected(bool selected)
{
- if( mActive != active )
+ if( mSelected != selected )
{
- if( active )
+ if( selected )
{
Actor parent = Self().GetParent();
if( parent )
if( rbChild )
{
- rbChild.SetActive(false);
+ rbChild.SetSelected(false);
}
}
}
- mActive = true;
- mRadioIcon.SetImage(mActiveImage);
+ mSelected = true;
+ mRadioIcon.SetImage(mSelectedImage);
}
else
{
- mActive = false;
- mRadioIcon.SetImage(mInactiveImage);
+ mSelected = false;
+ mRadioIcon.SetImage(mUnselectedImage);
}
- // Raise toggled signal
+ // Raise state changed signal
Toolkit::RadioButton handle( GetOwner() );
- mToggledSignalV2.Emit( handle, mActive );
+ mStateChangedSignal.Emit( handle, mSelected );
RelayoutRequest();
}
}
-bool RadioButton::IsActive()const
+bool RadioButton::IsSelected()const
{
- return mActive;
+ return mSelected;
}
void RadioButton::ToggleState()
{
- SetActive(!mActive);
+ SetSelected(!mSelected);
}
-void RadioButton::OnRelaidOut( Vector2 /*size*/, ActorSizeContainer& container )
+void RadioButton::OnRelayout( const Vector2& /*size*/, ActorSizeContainer& container )
{
Vector3 newSize( mRadioIcon.GetNaturalSize() );
void RadioButton::OnButtonUp()
{
- // Don't allow selection on an already active radio button
- if( !mActive )
+ // Don't allow selection on an already selected radio button
+ if( !mSelected )
{
ToggleState();
}
{
RadioButton& radioButtonImpl( GetImplementation( radioButton ) );
- switch ( propertyIndex )
+ if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLED )
{
- case Toolkit::RadioButton::PROPERTY_ACTIVE:
- {
- radioButtonImpl.SetActive( value.Get< bool >( ) );
- break;
- }
- case Toolkit::RadioButton::PROPERTY_LABEL_ACTOR:
- {
- radioButtonImpl.SetLabel( Scripting::NewActor( value.Get< Property::Map >( ) ) );
- break;
- }
+ radioButtonImpl.SetSelected( value.Get< bool >( ) );
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_LABEL_ACTOR )
+ {
+ radioButtonImpl.SetLabel( Scripting::NewActor( value.Get< Property::Map >( ) ) );
}
}
}
{
RadioButton& radioButtonImpl( GetImplementation( radioButton ) );
- switch ( propertyIndex )
+ if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLED )
{
- case Toolkit::RadioButton::PROPERTY_ACTIVE:
- {
- value = radioButtonImpl.mActive;
- break;
- }
- case Toolkit::RadioButton::PROPERTY_LABEL_ACTOR:
- {
- Property::Map map;
- Scripting::CreatePropertyMap( radioButtonImpl.mLabel, map );
- value = map;
- break;
- }
+ value = radioButtonImpl.mSelected;
+ }
+ else if ( propertyIndex == Toolkit::Button::PROPERTY_LABEL_ACTOR )
+ {
+ Property::Map map;
+ Scripting::CreatePropertyMap( radioButtonImpl.mLabel, map );
+ value = map;
}
}
Actor GetLabel() const;
/**
- * @copydoc Dali::Toolkit::RadioButton::SetActive(bool active)
+ * @copydoc Dali::Toolkit::RadioButton::SetSelected(bool selected)
*/
- void SetActive(bool active);
+ void SetSelected(bool selected);
/**
- * @copydoc Dali::Toolkit::RadioButton::IsActive()
+ * @copydoc Dali::Toolkit::RadioButton::IsSelected()
*/
- bool IsActive()const;
+ bool IsSelected()const;
/**
* @copydoc Dali::Toolkit::RadioButton::ToggleState()
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
// Undefined
RadioButton& operator=(const RadioButton& origin);
- Image mInactiveImage; ///< Stores the inactive image
- Image mActiveImage; ///< Stores the active image
+ Image mUnselectedImage; ///< Stores the unselected image
+ Image mSelectedImage; ///< Stores the selected image
ImageActor mRadioIcon; ///< Stores the current image
- Actor mLabel; ///< Stores the button label
- bool mActive; ///< Stores the active state
+ Actor mLabel; ///< Stores the button label
+ bool mSelected; ///< Stores the selected state
} ;
} // namespace Internal
// Guard against destruction during signal emission
Toolkit::Popup handle( GetOwner() );
- mHiddenSignalV2.Emit();
+ mHiddenSignal.Emit();
}
}
-Toolkit::Popup::TouchedOutsideSignalV2& Popup::OutsideTouchedSignal()
+Toolkit::Popup::TouchedOutsideSignalType& Popup::OutsideTouchedSignal()
{
- return mTouchedOutsideSignalV2;
+ return mTouchedOutsideSignal;
}
-Toolkit::Popup::HiddenSignalV2& Popup::HiddenSignal()
+Toolkit::Popup::HiddenSignalType& Popup::HiddenSignal()
{
- return mHiddenSignalV2;
+ return mHiddenSignal;
}
bool Popup::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
// Guard against destruction during signal emission
Toolkit::Popup handle( GetOwner() );
- mTouchedOutsideSignalV2.Emit();
+ mTouchedOutsideSignal.Emit();
}
}
}
}
-void Popup::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void Popup::OnRelayout( const Vector2& size, ActorSizeContainer& container )
{
// Set the popup size
Vector2 popupSize;
/**
* @copydoc Dali::Toolkit::Popup::OutsideTouchedSignal()
*/
- Toolkit::Popup::TouchedOutsideSignalV2& OutsideTouchedSignal();
+ Toolkit::Popup::TouchedOutsideSignalType& OutsideTouchedSignal();
/**
* @copydoc Dali::Toolkit::Popup::HiddenSignal()
*/
- Toolkit::Popup::HiddenSignalV2& HiddenSignal();
+ Toolkit::Popup::HiddenSignalType& HiddenSignal();
/**
* Connects a callback function with the object's signals.
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()
LayoutInfo mLayoutInfo; ///< Stores sizes of all popup components.
- Toolkit::Popup::TouchedOutsideSignalV2 mTouchedOutsideSignalV2;
- Toolkit::Popup::HiddenSignalV2 mHiddenSignalV2;
+ Toolkit::Popup::TouchedOutsideSignalType mTouchedOutsideSignal;
+ Toolkit::Popup::HiddenSignalType mHiddenSignal;
Property::Index mPropertyTitle; ///< Property index for Title.
Property::Index mPropertyState; ///< Property index for popup state.
RemoveActorsOutsideRange( range );
AddActorsWithinRange( range, 0.0f/*immediate*/ );
- mScrollUpdatedSignalV2.Emit( Vector3(0.0f, currentLayoutPosition, 0.0f) );
+ mScrollUpdatedSignal.Emit( Vector3(0.0f, currentLayoutPosition, 0.0f) );
}
}
if(mScrollAnimation)
{
- mScrollCompletedSignalV2.Emit(GetCurrentScrollPosition());
+ mScrollCompletedSignal.Emit(GetCurrentScrollPosition());
}
RemoveAnimation(mScrollAnimation);
mScrollPositionObject.SetProperty( ScrollConnector::SCROLL_POSITION, firstItemScrollPosition );
self.SetProperty(mPropertyPosition, GetScrollPosition(firstItemScrollPosition, layoutSize));
- mScrollStartedSignalV2.Emit(GetCurrentScrollPosition());
+ mScrollStartedSignal.Emit(GetCurrentScrollPosition());
mRefreshEnabled = true;
}
mScrollOvershoot = 0.0f;
AnimateScrollOvershoot(0.0f);
- mScrollCompletedSignalV2.Emit(GetCurrentScrollPosition());
+ mScrollCompletedSignal.Emit(GetCurrentScrollPosition());
}
}
// Reset the overshoot if no scroll animation.
if (!mScrollAnimation)
{
- mScrollCompletedSignalV2.Emit(GetCurrentScrollPosition());
+ mScrollCompletedSignal.Emit(GetCurrentScrollPosition());
AnimateScrollOvershoot(0.0f, false);
}
case Gesture::Started: // Fall through
{
mTotalPanDisplacement = Vector2::ZERO;
- mScrollStartedSignalV2.Emit(GetCurrentScrollPosition());
+ mScrollStartedSignal.Emit(GetCurrentScrollPosition());
mRefreshEnabled = true;
}
RemoveAnimation(mScrollAnimation); // mScrollAnimation is used to query whether we're scrolling
- mScrollCompletedSignalV2.Emit(GetCurrentScrollPosition());
+ mScrollCompletedSignal.Emit(GetCurrentScrollPosition());
if(mIsFlicking && fabsf(mScrollOvershoot) > Math::MACHINE_EPSILON_1)
{
AnimateScrollOvershoot(0.0f);
}
- mScrollStartedSignalV2.Emit(GetCurrentScrollPosition());
+ mScrollStartedSignal.Emit(GetCurrentScrollPosition());
mRefreshEnabled = true;
}
AnimateScrollOvershoot(0.0f);
}
- mScrollStartedSignalV2.Emit(GetCurrentScrollPosition());
+ mScrollStartedSignal.Emit(GetCurrentScrollPosition());
mRefreshEnabled = true;
}
// EXTERNAL INCLUDES
#include <dali/public-api/object/base-object.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>
* move the Actor's edge visually away from the neighboring actor, as they rotate
* around their default anchor point.
*/
-class ScrollCarouselEffectInfo : public Dali::RefObject
+class ScrollCarouselEffectInfo
{
public:
Vector2 mVisibilityThreshold; ///< Threshold for when to to switch off visibility of Actor (for performance)
};
-typedef IntrusivePtr<ScrollCarouselEffectInfo> ScrollCarouselEffectInfoPtr;
-
/**
* Helper: Applies the 3D scroll carousel constraints to the child actor
*
*/
void ApplyScrollCarouselConstraints(Toolkit::ScrollView scrollView,
Actor child,
- ScrollCarouselEffectInfoPtr info)
+ ScrollCarouselEffectInfo& info)
{
// Apply constraints to this actor //
Constraint constraint;
void ScrollViewCarouselEffect::ApplyToActor(Actor child, const Vector2& angleSwing)
{
- ScrollCarouselEffectInfoPtr info(new ScrollCarouselEffectInfo(angleSwing));
+ ScrollCarouselEffectInfo info( angleSwing );
ApplyScrollCarouselConstraints( GetScrollView(), child, info );
}
* When at middle of the screen the position is not altered.
* When one screen away from middle the position is rotated about it's origin + mAnchor
*/
-class ScrollCubeEffectInfo : public Dali::RefObject
+class ScrollCubeEffectInfo
{
public:
Vector3 mPositionSwing; ///< Maximum amount in X and Y axes to alter position.
};
-typedef IntrusivePtr<ScrollCubeEffectInfo> ScrollCubeEffectInfoPtr;
-
/**
* Helper: Applies the 3D scroll cube constraints to the child actor
*
void ApplyScrollCubeConstraints(Toolkit::ScrollView scrollView,
Actor child,
Actor parentPage,
- ScrollCubeEffectInfoPtr info)
+ const ScrollCubeEffectInfo& info)
{
// Apply constraints to this actor //
Constraint constraint;
const Vector2& angleSwing,
const Vector2& positionSwing)
{
- ScrollCubeEffectInfoPtr info(new ScrollCubeEffectInfo(anchor, angleSwing, positionSwing));
+ ScrollCubeEffectInfo info( anchor, angleSwing, positionSwing );
ApplyScrollCubeConstraints( GetScrollView(), child, child.GetParent(), info );
}
const Vector2& angleSwing,
const Vector2& positionSwing)
{
- ScrollCubeEffectInfoPtr info(new ScrollCubeEffectInfo(anchor, angleSwing, positionSwing));
+ ScrollCubeEffectInfo info( anchor, angleSwing, positionSwing );
ApplyScrollCubeConstraints( GetScrollView(), child, parentPage, info );
}
+++ /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/scrollable/scroll-view/scroll-view-custom-effect-impl.h>
-
-// EXTERNAL INCLUDES
-#include <boost/bind.hpp>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h>
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-
-namespace // unnamed namespace
-{
-
-using namespace ScrollViewHelperFunctions;
-
-/**
- * ScrollViewCustomEffectInfo
- *
- * ScrollAmountConstraint calculates the attached actor's current scroll position, -1.0f to 1.0f is from one side of the screen to the other.
- * It also calculates if the other constraints can be skipped
- *
- * Color constraint: adjusts the alpha of the page based on their parent page's position relative
- * to the middle of the screen.
- * When at middle of screen Alpha is 100% opacity.
- * When outside the viewable area, the opacity is 0%.
- *
- * Position constraint: adjusts the position of the page based on their parent page's position
- * relative to the middle of the screen.
- * When at middle of the screen the position is not altered.
- * When one screen away from middle the position is rotated as per expected in a 3D inner cube.
- */
-class ScrollViewCustomEffectInfo : public Dali::RefObject
-{
-public:
-
- ScrollViewCustomEffectInfo( uint flags,
- Property::Index scrollAmountProperty,
- Property::Index anchorProperty,
- const Vector2& pageSpacing,
- const Vector3& translateIn, const Vector3& translateOut,
- const Quaternion& globalRotateIn, const Quaternion& globalRotateOut,
- const Vector3& globalOriginIn, const Vector3& globalOriginOut,
- const float swingAngleIn, const Vector3& swingAxisIn, const float swingAngleOut, const Vector3& swingAxisOut,
- const Vector3& swingAnchorIn, const Vector3& swingAnchorOut,
- const float opacityThresholdIn, const float opacityThresholdOut,
- AlphaFunction globalRotateAlphaFunctionIn, AlphaFunction globalRotateAlphaFunctionOut,
- AlphaFunction swingAlphaFunctionIn, AlphaFunction swingAlphaFunctionOut,
- AlphaFunction swingAnchorAlphaFunctionIn, AlphaFunction swingAnchorAlphaFunctionOut,
- AlphaFunction translateAlphaFunctionIn, AlphaFunction translateAlphaFunctionOut,
- AlphaFunction opacityAlphaFunctionIn, AlphaFunction opacityAlphaFunctionOut ) :
- mScrollAmountProperty(scrollAmountProperty),
- mAnchorProperty(anchorProperty),
- mFlags(flags),
- mPageSpacing(pageSpacing),
- mTranslateIn(translateIn), mTranslateOut(translateOut),
- mGlobalRotateIn(globalRotateIn), mGlobalRotateOut(globalRotateOut),
- mGlobalOriginIn(globalOriginIn), mGlobalOriginOut(globalOriginOut),
- mSwingAngleIn(swingAngleIn), mSwingAxisIn(swingAxisIn), mSwingAngleOut(swingAngleOut), mSwingAxisOut(swingAxisOut),
- mSwingAnchorIn(swingAnchorIn), mSwingAnchorOut(swingAnchorOut),
- mOpacityThresholdIn(opacityThresholdIn), mOpacityThresholdOut(opacityThresholdOut),
- mGlobalRotateAlphaFunctionIn(globalRotateAlphaFunctionIn), mGlobalRotateAlphaFunctionOut(globalRotateAlphaFunctionOut),
- mSwingAlphaFunctionIn(swingAlphaFunctionIn), mSwingAlphaFunctionOut(swingAlphaFunctionOut),
- mSwingAnchorAlphaFunctionIn(swingAnchorAlphaFunctionIn), mSwingAnchorAlphaFunctionOut(swingAnchorAlphaFunctionOut),
- mTranslateAlphaFunctionIn(translateAlphaFunctionIn), mTranslateAlphaFunctionOut(translateAlphaFunctionOut),
- mOpacityAlphaFunctionIn(opacityAlphaFunctionIn), mOpacityAlphaFunctionOut(opacityAlphaFunctionOut),
- mWrap(false),
- mPanning(false),
- mScrolling(false),
- mWasOutsideView(true),
- mIsStraightOnView(false),
- mWasStraightOnView(false),
- mWrapped(false),
- mWasWrapped(false),
- mCanChangeDirection(false),
- mSkipConstraints(false),
- mPassedCentreThisFrame(false),
- mForceDirectionUpdate(true),
- mDirectionChanged(false),
- mDirectionFlags(0),
- mLastDirectionFlags(0),
- mCurrentSwingAngle(0.f),
- mCurrentOpacity(0.f),
- mCurrentOpacityAlphaFunction(NULL)
- {
- }
-
- Vector3 ScrollAmountConstraint(const Vector3& current,
- const PropertyInput& pagePositionProperty,
- const PropertyInput& scrollPositionProperty,
- const PropertyInput& scrollPositionMin,
- const PropertyInput& scrollPositionMax,
- const PropertyInput& pageSizeProperty,
- const PropertyInput& scrollWrap)
- {
- // store last scroll pos
- mLastScrollPosition = mScrollPos;
- mPagePos = pagePositionProperty.GetVector3();
- mScrollPos = scrollPositionProperty.GetVector3();
- mScrollMin = scrollPositionMin.GetVector3();
- mScrollMax = scrollPositionMax.GetVector3();
- mPageSize = pageSizeProperty.GetVector3();
- mWrap = scrollWrap.GetBoolean();
- mWasWrapped = mWrapped;
-
- mLastDirectionFlags = mDirectionFlags;
-
- // Get position of page.
- mPosition = mPagePos + mScrollPos;
-
- // short circuit: if we're looking straight on at the page (jonny 5 is alive)
- mIsStraightOnView = IsStraightOnView( mPosition );
-
- mLastScrollAmount = mScrollAmount;
- Vector3 newScrollAmount(mPosition / mPageSize);
- mScrollAmount = newScrollAmount;
- mWrapped = false;
- if( !mIsStraightOnView && mWrap )
- {
- // only need to wrap if not already straight on view
- WrapPositionWithinDomain( mPosition, mPageSize, mScrollMin, mScrollMax );
- mIsStraightOnView = IsStraightOnView( mPosition );
- newScrollAmount = mPosition / mPageSize;
- if((mScrollAmount.x > 0.0f && newScrollAmount.x < 0.0f)
- || (mScrollAmount.x < 0.0f && newScrollAmount.x > 0.0f)
- || (mScrollAmount.y > 0.0f && newScrollAmount.y < 0.0f)
- || (mScrollAmount.y < 0.0f && newScrollAmount.y > 0.0f))
- {
- mWrapped = true;
- }
- }
- mScrollAmount = newScrollAmount;
-
- return mScrollAmount;
- }
-
- Quaternion PageDirectionAndRotationConstraint(const Quaternion& current,
- const PropertyInput& scrollPositionProperty,
- const PropertyInput& panningProperty,
- const PropertyInput& scrollingProperty)
- {
- bool panning = panningProperty.GetBoolean();
- bool scrolling = scrollingProperty.GetBoolean();
-
- bool isOutsideView = IsOutsideView( mPosition, mPageSize );
-
- mSkipConstraints = isOutsideView | mIsStraightOnView;
-
- bool bIsCurrentPage = mScrollAmount.x > -0.5f && mScrollAmount.x < 0.5f;
-
- if(mSkipConstraints)
- {
- mPanning = panning;
- mScrolling = scrolling;
- mWasOutsideView = isOutsideView;
- mWasStraightOnView = mIsStraightOnView;
- return current;
- }
- Vector3 scrollDirection = mScrollAmount - mLastScrollAmount;
- mPassedCentreThisFrame = bIsCurrentPage && (((mLastScrollAmount.x < 0.0f) && (mScrollAmount.x > 0.0f)) || ((mLastScrollAmount.x > 0.0f) && (mScrollAmount.x < 0.0f)) || ((mLastScrollAmount.y < 0.0f) && (mScrollAmount.y > 0.0f)) || ((mLastScrollAmount.y > 0.0f) && (mScrollAmount.y < 0.0f)) || (mWasStraightOnView && !mIsStraightOnView));
-
- // may have wrapped this frame and never gone out of view
- bool bWrappedOffScreen = (mWrapped != mWasWrapped && (fabs(scrollDirection.x) > 1.0f || fabs(scrollDirection.y) > 1.0f));
-
- mCanChangeDirection = (scrolling && !mScrolling) || mPassedCentreThisFrame || (!isOutsideView && mWasOutsideView) || bWrappedOffScreen;
-
- if(mCanChangeDirection)
- {
- // figure out if we have changed direction
- if((mWrapped != mWasWrapped) && (fabs(scrollDirection.x) > 1.0f || fabs(scrollDirection.y) || (!isOutsideView && mWasOutsideView)))
- {
- if( fabs(scrollDirection.x) > 1.0f )
- {
- if(scrollDirection.x < 0.0f)
- {
- scrollDirection.x += (mScrollMax.x - mScrollMin.x) / mPageSize.x;
- }
- else
- {
- scrollDirection.x -= (mScrollMax.x - mScrollMin.x) / mPageSize.x;
- }
- }
- if( fabs(scrollDirection.y) > 1.0f )
- {
- if(scrollDirection.y < 0.0f)
- {
- scrollDirection.y += (mScrollMax.y - mScrollMin.y) / mPageSize.y;
- }
- else
- {
- scrollDirection.y -= (mScrollMax.y - mScrollMin.y) / mPageSize.y;
- }
- }
- }
-
- // clear direction flags
- mDirectionFlags &= ~Toolkit::ScrollView::DirectionFlagMask_Direction;
- if(scrollDirection.x < 0.0f)
- {
- mDirectionFlags |= Toolkit::ScrollView::DirectionFlagLeft;
- }
- else if( scrollDirection.x > 0.0f )
- {
- mDirectionFlags |= Toolkit::ScrollView::DirectionFlagRight;
- }
-
- if(scrolling && !mScrolling)
- {
- // have started moving
- if(((mDirectionFlags & Toolkit::ScrollView::DirectionFlagLeft)
- && (mScrollAmount.x > 0.0f))
- || ((mDirectionFlags & Toolkit::ScrollView::DirectionFlagRight)
- && (mScrollAmount.x < 0.0f)))
- {
- // started moving towards the screen, allow transition change
- mDirectionFlags = (mDirectionFlags & ~Toolkit::ScrollView::DirectionFlagMask_Transition) | Toolkit::ScrollView::DirectionFlagTransitionOn;
- }
- else if(((mDirectionFlags & Toolkit::ScrollView::DirectionFlagLeft)
- && (mScrollAmount.x < 0.0f))
- || ((mDirectionFlags & Toolkit::ScrollView::DirectionFlagRight)
- && (mScrollAmount.x > 0.0f)))
- {
- // started moving away from screen, allow transition change
- mDirectionFlags = (mDirectionFlags & ~Toolkit::ScrollView::DirectionFlagMask_Transition) | Toolkit::ScrollView::DirectionFlagTransitionOff;
- }
- }
- else
- {
- // have changed direction
- if((((mDirectionFlags & Toolkit::ScrollView::DirectionFlagLeft)
- && mScrollAmount.x > 0.0f)
- || ((mDirectionFlags & Toolkit::ScrollView::DirectionFlagRight)
- && mScrollAmount.x < 0.0f))
- && (isOutsideView || (!isOutsideView && mWasOutsideView) || bWrappedOffScreen))
- {
- // went from moving away to moving towards and can change direction
- mDirectionFlags = (mDirectionFlags & ~Toolkit::ScrollView::DirectionFlagMask_Transition) | Toolkit::ScrollView::DirectionFlagTransitionOn;
- }
- else if((((mDirectionFlags & Toolkit::ScrollView::DirectionFlagLeft)
- && (mScrollAmount.x < 0.0f))
- || ((mDirectionFlags & Toolkit::ScrollView::DirectionFlagRight)
- && (mScrollAmount.x > 0.0f)))
- && (isOutsideView || mPassedCentreThisFrame || bWrappedOffScreen))
- {
- // went from moving towards to moving away and can change direction
- mDirectionFlags = (mDirectionFlags & (~Toolkit::ScrollView::DirectionFlagMask_Transition)) | Toolkit::ScrollView::DirectionFlagTransitionOff;
- }
- }
- // now set up current values depending on direction
- if(mFlags & Toolkit::ScrollViewCustomEffect::FlagTranslate)
- {
- // want to translate by specific amount
- if((mFlags & Toolkit::ScrollViewCustomEffect::FlagTranslateIn)
- && (mDirectionFlags & Toolkit::ScrollView::DirectionFlagTransitionOn))
- {
- mCurrentTranslation = mTranslateIn;
- }
- else if((mFlags & Toolkit::ScrollViewCustomEffect::FlagTranslateOut)
- && (mDirectionFlags & Toolkit::ScrollView::DirectionFlagTransitionOff))
- {
- mCurrentTranslation = mTranslateOut;
- }
- else if(!(mFlags & (Toolkit::ScrollViewCustomEffect::FlagTranslateIn | Toolkit::ScrollViewCustomEffect::FlagTranslateOut)))
- {
- // using same value for both transitions
- mCurrentTranslation = mTranslateIn;
- }
- else
- {
- // no value to use
- mCurrentTranslation = Vector3::ZERO;
- }
- }
-
- if(mFlags & Toolkit::ScrollViewCustomEffect::FlagRotate)
- {
- // want to rotate around an origin
- if(mFlags & Toolkit::ScrollViewCustomEffect::FlagRotateAngleForcedOrigin)
- {
- // the angle forces the origin position depending on page size
- // also the page spacing is implemented by setting the 'fake' origin far enough back to add a small gap between pages
- // use rotation origin since it isnt needed otherwise
- mCurrentGlobalOrigin = mGlobalOriginIn;
- }
- else
- {
- mCurrentGlobalRotation = mGlobalRotateIn;
- if((mFlags & Toolkit::ScrollViewCustomEffect::FlagRotateOut)
- && (mDirectionFlags & Toolkit::ScrollView::DirectionFlagTransitionOff))
- {
- mCurrentGlobalRotation = mGlobalRotateOut;
- }
- }
- }
-
- // now set up current values depending on direction
- if(mFlags & Toolkit::ScrollViewCustomEffect::FlagSwingAngle)
- {
- // want to translate by specific amount
- if((mFlags & Toolkit::ScrollViewCustomEffect::FlagSwingAngleIn)
- && (mDirectionFlags & Toolkit::ScrollView::DirectionFlagTransitionOn))
- {
- // moving towards centre of screen and have a value for that
- mCurrentSwingAngle = mSwingAngleIn;
- mCurrentSwingAxis = mSwingAxisIn;
- }
- else if((mFlags & Toolkit::ScrollViewCustomEffect::FlagSwingAngleOut)
- && (mDirectionFlags & Toolkit::ScrollView::DirectionFlagTransitionOff))
- {
- // moving away from centre of screen and have a value for that
- mCurrentSwingAngle = mSwingAngleOut;
- mCurrentSwingAxis = mSwingAxisOut;
- }
- else if(!(mFlags & (Toolkit::ScrollViewCustomEffect::FlagSwingAngleIn | Toolkit::ScrollViewCustomEffect::FlagSwingAngleOut)))
- {
- // using same value for both transitions
- mCurrentSwingAngle = mSwingAngleIn;
- mCurrentSwingAxis = mSwingAxisIn;
- }
- else
- {
- // no value to use
- mCurrentSwingAngle = 0.0f;
- mCurrentSwingAxis = Vector3(0.0f, -1.0f, 0.0f);
- }
-
- if(mFlags & Toolkit::ScrollViewCustomEffect::FlagSwingAnchor)
- {
- // want to translate by specific amount
- if((mFlags & Toolkit::ScrollViewCustomEffect::FlagSwingAnchorIn)
- && (mDirectionFlags & Toolkit::ScrollView::DirectionFlagTransitionOn))
- {
- mCurrentSwingAnchor = mSwingAnchorIn;
- }
- else if((mFlags & Toolkit::ScrollViewCustomEffect::FlagSwingAnchorOut)
- && (mDirectionFlags & Toolkit::ScrollView::DirectionFlagTransitionOff))
- {
- mCurrentSwingAnchor = mSwingAnchorOut;
- }
- else if(!(mFlags & (Toolkit::ScrollViewCustomEffect::FlagSwingAnchorIn | Toolkit::ScrollViewCustomEffect::FlagSwingAnchorOut)))
- {
- // using same value for both transitions
- mCurrentSwingAnchor = mSwingAnchorIn;
- }
- else
- {
- // no value to use
- mCurrentSwingAnchor = Vector3(0,0,0);
- }
- if(mDirectionFlags & Toolkit::ScrollView::DirectionFlagLeft)
- {
- mCurrentSwingAnchor *= -1.0f;
- }
- }
- }
-
- // now set up current values depending on direction
- if(mFlags & Toolkit::ScrollViewCustomEffect::FlagOpacityThreshold)
- {
- mCurrentOpacity = mOpacityThresholdIn;
- if((mFlags & Toolkit::ScrollViewCustomEffect::FlagOpacityThresholdOut)
- && (mDirectionFlags & Toolkit::ScrollView::DirectionFlagTransitionOff))
- {
- mCurrentOpacity = mOpacityThresholdOut;
- }
- if(mFlags & Toolkit::ScrollViewCustomEffect::FlagOpacityAlphaFunctionMask)
- {
- // need to adjust using alpha functions
- if( (mFlags & Toolkit::ScrollViewCustomEffect::FlagOpacityAlphaFunctionIn)
- && (mDirectionFlags & Toolkit::ScrollView::DirectionFlagTransitionOn) )
- {
- mCurrentOpacityAlphaFunction = mOpacityAlphaFunctionIn;
- }
- else if( (mFlags & Toolkit::ScrollViewCustomEffect::FlagOpacityAlphaFunctionOut)
- && (mDirectionFlags & Toolkit::ScrollView::DirectionFlagTransitionOff) )
- {
- mCurrentOpacityAlphaFunction = mOpacityAlphaFunctionOut;
- }
- else
- {
- mCurrentOpacityAlphaFunction = NULL;
- }
- }
- }
- }
-
- // if user panning OR any form of scroll direction (animated included) set panning to true
- mPanning = panning;
- mScrolling = scrolling;
- mWasOutsideView = isOutsideView;
- mWasStraightOnView = mIsStraightOnView;
-
- if(!(mFlags & Toolkit::ScrollViewCustomEffect::FlagSwingAngle))
- {
- return current;
- }
- Vector3 amount(mScrollAmount);
- if(mFlags & Toolkit::ScrollViewCustomEffect::FlagSwingAngleAlphaFunctionMask)
- {
- // need to apply alpha function
- if((mFlags & Toolkit::ScrollViewCustomEffect::FlagSwingAngleAlphaFunctionIn)
- && (mDirectionFlags & Toolkit::ScrollView::DirectionFlagTransitionOn))
- {
- amount.x = mSwingAlphaFunctionIn(fabs(mScrollAmount.x));
- amount.y = mSwingAlphaFunctionIn(fabs(mScrollAmount.y));
- if(mScrollAmount.x < 0)
- {
- amount.x *= -1.0f;
- }
- if(mScrollAmount.y < 0)
- {
- amount.y *= -1.0f;
- }
- }
- else if((mFlags & Toolkit::ScrollViewCustomEffect::FlagSwingAngleAlphaFunctionOut)
- && (mDirectionFlags & Toolkit::ScrollView::DirectionFlagTransitionOff))
- {
- amount.x = mSwingAlphaFunctionOut(fabs(mScrollAmount.x));
- amount.y = mSwingAlphaFunctionOut(fabs(mScrollAmount.y));
- if(mScrollAmount.x < 0)
- {
- amount.x *= -1.0f;
- }
- if(mScrollAmount.y < 0)
- {
- amount.y *= -1.0f;
- }
- }
- }
-
- // TODO - swing angle seems very slightly off... SORT IT!!
- //Quaternion rotation = Quaternion::Slerp(current, mCurrentSwingAngle, mScrollAmount.x);
- return Quaternion(mCurrentSwingAngle * amount.x, mCurrentSwingAxis) * current; // Quaternion::Lerp(current, mCurrentSwingAngle, mScrollAmount.x);
- }
-
- /**
- * @param[in] current The current color of this Actor
- * @param[in] scrollAmountProperty The scroll-view's position property (SCROLL_POSITION_PROPERTY_NAME)
- * @return The new color of this Actor.
- */
- Vector4 ColorConstraint(const Vector4& current,
- const PropertyInput& scrollAmountProperty)
- {
- if(mSkipConstraints)
- {
- if(!mIsStraightOnView)
- {
- // will be off screen, set alpha to 0 to stop drawing it
- return Vector4(current.r, current.g, current.b, 0.0f);
- }
- return current;
- }
-
- if( !(mFlags & Toolkit::ScrollViewCustomEffect::FlagOpacityThreshold) )
- {
- return current;
- }
-
- float amount = fabsf(mScrollAmount.x);
- if((mFlags & Toolkit::ScrollViewCustomEffect::FlagOpacityAlphaFunctionMask)
- && mCurrentOpacityAlphaFunction)
- {
- amount = mCurrentOpacityAlphaFunction(amount);
- }
- Vector4 newColour(current.r, current.g, current.b, fmaxf(((1.0f - amount) / (1.0f - mCurrentOpacity)), 0.0f));
- return newColour;
- }
-
- /**
- * @brief PositionConstraint2
- * @param current
- * @param scrollPositionProperty
- * @param startPagePosition
- * @param startDirection
- * @return
- */
- Vector3 PositionConstraint(const Vector3& current,
- const PropertyInput& scrollAmountProperty,
- const PropertyInput& anchorProperty,
- const PropertyInput& rotationProperty)
- {
- if(mSkipConstraints)
- {
- return mPosition;
- }
-
- Vector3 newPosition;
-
- if(mFlags & Toolkit::ScrollViewCustomEffect::FlagRotateAngleForcedOrigin)
- {
- Quaternion qx(mScrollAmount.x * mCurrentGlobalOrigin.x, Vector3(0, 1, 0));
- Quaternion qy(mScrollAmount.y * mCurrentGlobalOrigin.y, Vector3(1, 0, 0));
-
- float thetaBx = (Math::PI - mCurrentGlobalOrigin.x) * 0.5f;
- float radiusx = ((mPageSize.width + mPageSpacing.width) * 0.5f) * tanf(thetaBx);
- Vector3 originPositionVec = Vector3(0, 0, radiusx);
- Vector3 horizontalPos = qx.Rotate(originPositionVec);
- newPosition.x = horizontalPos.x;
- newPosition.z = radiusx - horizontalPos.z;
- // need to create an origin based on current horizontal/vertical scrolling page size
- //Vector2 thetaA(mScrollAmount.x * mCurrentGlobalOrigin.x, mScrollAmount.y * mCurrentGlobalOrigin.y);
- float thetaBy = (Math::PI - mCurrentGlobalOrigin.y) * 0.5f;
- float radiusy = ((mPageSize.height + mPageSpacing.height) * 0.5f) * tanf(thetaBy);
- originPositionVec = Vector3(0, 0, radiusy);
- horizontalPos = qy.Rotate(originPositionVec);
- newPosition.y = horizontalPos.y;
- if(mDirectionFlags & (Toolkit::ScrollView::DirectionFlagUp | Toolkit::ScrollView::DirectionFlagDown))
- {
- newPosition.z = radiusy - horizontalPos.z;
- }
-
- //Vector3 vRadius(sinf(thetaA.x) * radius, sinf(thetaA.y) * radius, z);
- //newPosition = Vector3(vRadius.x, vRadius.y, -vRadius.z + radius);
- }
- else if(mFlags & Toolkit::ScrollViewCustomEffect::FlagRotate)
- {
- // rotate around our origin which is relative to the scene
- Vector3 vec = newPosition - mCurrentGlobalOrigin;
- newPosition -= vec;
- vec = mCurrentGlobalRotation.Rotate(vec);
- newPosition += vec;
- }
-
- if(mFlags & Toolkit::ScrollViewCustomEffect::FlagTranslate)
- {
- //Vector3 spacing(mPageSpacing.x, 0, 0);
- Vector3 amount(mScrollAmount);
- amount.z = fabs(mScrollAmount.x);
- if(mFlags & Toolkit::ScrollViewCustomEffect::FlagTranslationAlphaFunctionMask)
- {
- // need to apply alpha function
- if((mFlags & Toolkit::ScrollViewCustomEffect::FlagTranslationAlphaFunctionIn)
- && (mDirectionFlags & Toolkit::ScrollView::DirectionFlagTransitionOn))
- {
- amount.x = mTranslateAlphaFunctionIn(fabs(mScrollAmount.x));
- amount.y = mTranslateAlphaFunctionIn(fabs(mScrollAmount.y));
- amount.z = mTranslateAlphaFunctionIn(fabs(mScrollAmount.x));
- if(mScrollAmount.x < 0)
- {
- amount.x *= -1.0f;
- }
- if(mScrollAmount.y < 0)
- {
- amount.y *= -1.0f;
- }
- }
- else if((mFlags & Toolkit::ScrollViewCustomEffect::FlagTranslationAlphaFunctionOut)
- && (mDirectionFlags & Toolkit::ScrollView::DirectionFlagTransitionOff))
- {
- amount.x = mTranslateAlphaFunctionOut(fabs(mScrollAmount.x));
- amount.y = mTranslateAlphaFunctionOut(fabs(mScrollAmount.y));
- amount.z = mTranslateAlphaFunctionIn(fabs(mScrollAmount.x));
- if(mScrollAmount.x < 0)
- {
- amount.x *= -1.0f;
- }
- if(mScrollAmount.y < 0)
- {
- amount.y *= -1.0f;
- }
- }
- }
- newPosition += mCurrentTranslation * amount; // (mCurrentTranslation + ((!(mFlags & Toolkit::ScrollViewCustomEffect::FlagRotateAngleForcedOrigin)) ? (spacing * 0.5f) : Vector3(0,0,0))) * mScrollAmount;
- }
-
- if(mFlags & Toolkit::ScrollViewCustomEffect::FlagSwingAnchor)
- {
- // rotate around our anchor point which is local to our actor
- Quaternion rotation(mCurrentSwingAngle * mScrollAmount.x, mCurrentSwingAxis);
- Vector3 offset = mCurrentSwingAnchor * mPageSize;
- newPosition += offset;
- offset = rotation.Rotate(-offset);
- newPosition += offset;
- }
-
- return newPosition;
- }
-
- // input parameters
-
- Property::Index mScrollAmountProperty;
- Property::Index mAnchorProperty;
- uint mFlags; ///< flags describing functionality, set automatically depending on functions called during effect setup
- Vector2 mPageSpacing; ///< space between pages... kinda obvious really
- Vector3 mTranslateIn; ///< translation offset to use when scrolling a page onto the screen
- Vector3 mTranslateOut; ///< translation offset to use when scrolling a page off the screen
- Quaternion mGlobalRotateIn; ///< rotates the page's position around a point
- Quaternion mGlobalRotateOut; ///< rotates the page's position around a point
- Vector3 mGlobalOriginIn; ///< the point to rotate a page around when scrolling onto screen
- Vector3 mGlobalOriginOut; ///< the point to rotate a page around when scrolling off screen
- float mSwingAngleIn; ///< angle to rotate a page around its anchor when scrolling onto screen
- Vector3 mSwingAxisIn; ///< angle to rotate a page around its anchor when scrolling off screen
- float mSwingAngleOut; ///< angle to rotate a page around its anchor when scrolling onto screen
- Vector3 mSwingAxisOut; ///< angle to rotate a page around its anchor when scrolling off screen
- Vector3 mSwingAnchorIn; ///< the page anchor point to use when scrolling onto screen
- Vector3 mSwingAnchorOut; ///< the page anchor point to use when scrolling off screen
- float mOpacityThresholdIn; ///< the point at which opacity will change as page scrolls onto screen
- float mOpacityThresholdOut; ///< the point at which opacity will change as page scrolls off screen
- AlphaFunction mGlobalRotateAlphaFunctionIn;
- AlphaFunction mGlobalRotateAlphaFunctionOut;
- AlphaFunction mSwingAlphaFunctionIn;
- AlphaFunction mSwingAlphaFunctionOut;
- AlphaFunction mSwingAnchorAlphaFunctionIn;
- AlphaFunction mSwingAnchorAlphaFunctionOut;
- AlphaFunction mTranslateAlphaFunctionIn;
- AlphaFunction mTranslateAlphaFunctionOut;
- AlphaFunction mOpacityAlphaFunctionIn;
- AlphaFunction mOpacityAlphaFunctionOut;
-
- // constraint update params
- // taken from property inputs every constraint update
- Vector3 mPagePos;
- Vector3 mScrollPos;
- Vector3 mScrollMin;
- Vector3 mScrollMax;
- Vector3 mPageSize;
- bool mWrap:1;
- bool mPanning:1;
- bool mScrolling:1;
- bool mWasOutsideView:1;
- bool mIsStraightOnView:1;
- bool mWasStraightOnView:1;
- bool mWrapped:1; ///< whether the scroll page was wrapped this frame
- bool mWasWrapped:1; ///< whether the scroll page was wrapped last frame
- bool mCanChangeDirection:1;
- bool mSkipConstraints:1; ///< whether we can skip the main constraints
- bool mPassedCentreThisFrame:1; ///< true if control has moved passed centre of screen
- bool mForceDirectionUpdate:1;
- bool mDirectionChanged:1;
-
- // calculated each constraint update depending on flags set
- int mDirectionFlags;
- int mLastDirectionFlags;
- Vector2 mLastScrollPosition;
-
- Vector3 mPosition;
- Vector3 mScrollAmount;
- Vector3 mLastScrollAmount;
- Vector3 mCurrentTranslation;
- Quaternion mCurrentGlobalRotation;
- Vector3 mCurrentGlobalOrigin;
- float mCurrentSwingAngle;
- Vector3 mCurrentSwingAxis;
- Vector3 mCurrentSwingAnchor;
- float mCurrentOpacity;
- AlphaFunction mCurrentOpacityAlphaFunction;
-};
-
-typedef IntrusivePtr<ScrollViewCustomEffectInfo> ScrollViewCustomEffectInfoPtr;
-
-} // unnamed namespace
-
-const std::string ScrollViewCustomEffect::SCROLL_AMOUNT_PROPERTY_STRING( "scroll-amount" );
-const std::string ScrollViewCustomEffect::ANCHOR_POINT_PROPERTY_STRING( "custom-anchor-point" );
-
-ScrollViewCustomEffect::ScrollViewCustomEffect() :
- mFlags(0),
- mPageSpacing(0,0),
- mTranslateIn(0,0,0),
- mTranslateOut(0,0,0),
- mGlobalRotateIn(0.0f, Vector3(0, 1.0f, 0.0f)),
- mGlobalRotateOut(0.0f, Vector3(0, 1.0f, 0.0f)),
- mGlobalOriginIn(0,0,0),
- mGlobalOriginOut(0,0,0),
- mSwingAngleIn(0.0f),
- mSwingAxisIn(0.0f, 1.0f, 0.0f),
- mSwingAngleOut(0.0f),
- mSwingAxisOut(0.0f, 1.0f, 0.0f),
- mSwingAnchorIn(0,0,0),
- mSwingAnchorOut(0,0,0),
- mOpacityThresholdIn(0),
- mOpacityThresholdOut(0),
- mGlobalRotateAlphaFunctionIn(NULL),
- mGlobalRotateAlphaFunctionOut(NULL),
- mSwingAlphaFunctionIn(NULL),
- mSwingAlphaFunctionOut(NULL),
- mSwingAnchorAlphaFunctionIn(NULL),
- mSwingAnchorAlphaFunctionOut(NULL),
- mTranslateAlphaFunctionIn(NULL),
- mTranslateAlphaFunctionOut(NULL),
- mOpacityAlphaFunctionIn(NULL),
- mOpacityAlphaFunctionOut(NULL)
-{
-
-}
-
-ScrollViewCustomEffect::~ScrollViewCustomEffect()
-{
-}
-
-void ScrollViewCustomEffect::SetPageSpacing(const Vector2& spacing)
-{
- mPageSpacing = spacing;
-}
-
-void ScrollViewCustomEffect::SetPageTranslation(const Vector3& translation)
-{
- mFlags = (mFlags & ~Toolkit::ScrollViewCustomEffect::FlagTranslateMask) | Toolkit::ScrollViewCustomEffect::FlagTranslate;
- mTranslateIn = mTranslateOut = translation;
-}
-
-void ScrollViewCustomEffect::SetPageTranslation(const Vector3& translationIn, const Vector3& translationOut)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & ~Toolkit::ScrollViewCustomEffect::FlagTranslateMask)
- | Toolkit::ScrollViewCustomEffect::FlagTranslate
- | Toolkit::ScrollViewCustomEffect::FlagTranslateIn
- | Toolkit::ScrollViewCustomEffect::FlagTranslateOut;
-
- mTranslateIn = translationIn;
- mTranslateOut = translationOut;
-}
-
-void ScrollViewCustomEffect::SetPageTranslationIn(const Vector3& translation)
-{
- mFlags = (mFlags & (~Toolkit::ScrollViewCustomEffect::FlagTranslateMask | Toolkit::ScrollViewCustomEffect::FlagTranslateOut))
- | Toolkit::ScrollViewCustomEffect::FlagTranslate
- | Toolkit::ScrollViewCustomEffect::FlagTranslateIn;
-
- mTranslateIn = translation;
-}
-
-void ScrollViewCustomEffect::SetPageTranslationOut(const Vector3& translation)
-{
- mFlags = (mFlags & (~Toolkit::ScrollViewCustomEffect::FlagTranslateMask | Toolkit::ScrollViewCustomEffect::FlagTranslateIn))
- | Toolkit::ScrollViewCustomEffect::FlagTranslate
- | Toolkit::ScrollViewCustomEffect::FlagTranslateOut;
-
- mTranslateOut = translation;
-}
-
-void ScrollViewCustomEffect::SetPageTranslateAlphaFunction(AlphaFunction func)
-{
- if(func)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagTranslationAlphaFunctionMask;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagTranslationAlphaFunctionMask;
- }
- mTranslateAlphaFunctionIn = mTranslateAlphaFunctionOut = func;
-}
-
-void ScrollViewCustomEffect::SetPageTranslateAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut)
-{
- if(funcIn)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagTranslationAlphaFunctionIn;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagTranslationAlphaFunctionIn;
- }
- if(funcOut)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagTranslationAlphaFunctionOut;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagTranslationAlphaFunctionOut;
- }
- mTranslateAlphaFunctionIn = funcIn;
- mTranslateAlphaFunctionOut = funcOut;
-}
-
-void ScrollViewCustomEffect::SetPageTranslateAlphaFunctionIn(AlphaFunction func)
-{
- if(func)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagTranslationAlphaFunctionIn;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagTranslationAlphaFunctionIn;
- }
- mTranslateAlphaFunctionIn = func;
-}
-
-void ScrollViewCustomEffect::SetPageTranslateAlphaFunctionOut(AlphaFunction func)
-{
- if(func)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagTranslationAlphaFunctionOut;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagTranslationAlphaFunctionOut;
- }
- mTranslateAlphaFunctionOut = func;
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotation(float angle, const Vector3& axis)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & ~Toolkit::ScrollViewCustomEffect::FlagRotateMask) // reset rotate flags
- | Toolkit::ScrollViewCustomEffect::FlagRotate; // set new rotate flag
-
- mGlobalRotateIn = mGlobalRotateOut = Quaternion(angle, axis);
-}
-
-void ScrollViewCustomEffect::SetAngledOriginPageRotation(const Vector3& angle)
-{
- mFlags = (mFlags & ~Toolkit::ScrollViewCustomEffect::FlagRotateMask)
- | Toolkit::ScrollViewCustomEffect::FlagRotate
- | Toolkit::ScrollViewCustomEffect::FlagRotateAngleForcedOrigin;
-
- // set this angle into global originin for now, the flag will let us know what value to use in constraints
- mGlobalOriginIn = angle;
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotation(float angleIn, const Vector3& axisIn, float angleOut, const Vector3& axisOut)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & ~Toolkit::ScrollViewCustomEffect::FlagRotateMask)
- | Toolkit::ScrollViewCustomEffect::FlagRotate
- | Toolkit::ScrollViewCustomEffect::FlagRotateIn
- | Toolkit::ScrollViewCustomEffect::FlagRotateOut;
-
- mGlobalRotateIn = Quaternion(angleIn, axisIn);
- mGlobalRotateOut = Quaternion(angleOut, axisOut);
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotationIn(float angle, const Vector3& axis)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & (~Toolkit::ScrollViewCustomEffect::FlagRotateMask | Toolkit::ScrollViewCustomEffect::FlagRotateOut)) // reset all rotation flags except RotateOut, since they may be calling these functions separately
- | Toolkit::ScrollViewCustomEffect::FlagRotate
- | Toolkit::ScrollViewCustomEffect::FlagRotateIn;
-
- mGlobalRotateIn = Quaternion(angle, axis);
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotationOut(float angle, const Vector3& axis)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & (~Toolkit::ScrollViewCustomEffect::FlagRotateMask | Toolkit::ScrollViewCustomEffect::FlagRotateIn)) // reset all rotation flags except RotateOut, since they may be calling these functions separately
- | Toolkit::ScrollViewCustomEffect::FlagRotate
- | Toolkit::ScrollViewCustomEffect::FlagRotateOut;
-
- mGlobalRotateOut = Quaternion(angle, axis);
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotationOrigin(const Vector3& origin)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & ~Toolkit::ScrollViewCustomEffect::FlagRotateOriginMask) // reset all rotation flags
- | Toolkit::ScrollViewCustomEffect::FlagRotateOrigin;
-
- mGlobalOriginIn = mGlobalOriginOut = origin;
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotationOrigin(const Vector3& originIn, const Vector3& originOut)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & ~Toolkit::ScrollViewCustomEffect::FlagRotateOriginMask) // reset all rotation flags
- | Toolkit::ScrollViewCustomEffect::FlagRotateOrigin
- | Toolkit::ScrollViewCustomEffect::FlagRotateOriginIn
- | Toolkit::ScrollViewCustomEffect::FlagRotateOriginOut;
-
- mGlobalOriginIn = originIn;
- mGlobalOriginOut = originOut;
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotationOriginIn(const Vector3& origin)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & (~Toolkit::ScrollViewCustomEffect::FlagRotateOriginMask | Toolkit::ScrollViewCustomEffect::FlagRotateOriginOut)) // reset all rotation flags except RotateOut, since they may be calling these functions separately
- | Toolkit::ScrollViewCustomEffect::FlagRotateOrigin
- | Toolkit::ScrollViewCustomEffect::FlagRotateOriginIn;
-
- mGlobalOriginIn = origin;
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotationOriginOut(const Vector3& origin)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & (~Toolkit::ScrollViewCustomEffect::FlagRotateOriginMask | Toolkit::ScrollViewCustomEffect::FlagRotateOriginIn)) // reset all rotation flags except RotateOut, since they may be calling these functions separately
- | Toolkit::ScrollViewCustomEffect::FlagRotateOrigin
- | Toolkit::ScrollViewCustomEffect::FlagRotateOriginOut;
-
- mGlobalOriginOut = origin;
-}
-
-void ScrollViewCustomEffect::SetSwingAngle(const float angle, const Vector3& axis)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & ~Toolkit::ScrollViewCustomEffect::FlagSwingAngleMask) // reset rotate flags
- | Toolkit::ScrollViewCustomEffect::FlagSwingAngle; // set new rotate flag
-
- mSwingAngleIn = mSwingAngleOut = angle;
- mSwingAxisIn = mSwingAxisOut = axis;
-}
-
-void ScrollViewCustomEffect::SetSwingAngle(float angleIn, const Vector3& axisIn, float angleOut, const Vector3& axisOut)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & ~Toolkit::ScrollViewCustomEffect::FlagSwingAngleMask)
- | Toolkit::ScrollViewCustomEffect::FlagSwingAngle
- | Toolkit::ScrollViewCustomEffect::FlagSwingAngleIn
- | Toolkit::ScrollViewCustomEffect::FlagSwingAngleOut;
-
- mSwingAngleIn = angleIn;
- mSwingAngleOut = angleOut;
- mSwingAxisIn = axisIn;
- mSwingAxisOut = axisOut;
-}
-
-void ScrollViewCustomEffect::SetSwingAngleIn(float angle, const Vector3& axis)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & (~Toolkit::ScrollViewCustomEffect::FlagSwingAngleMask | Toolkit::ScrollViewCustomEffect::FlagSwingAngleOut)) // reset all rotation flags except RotateOut, since they may be calling these functions separately
- | Toolkit::ScrollViewCustomEffect::FlagSwingAngle
- | Toolkit::ScrollViewCustomEffect::FlagSwingAngleIn;
-
- mSwingAngleIn = angle;
- mSwingAxisIn = axis;
-}
-
-void ScrollViewCustomEffect::SetSwingAngleOut(float angle, const Vector3& axis)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & (~Toolkit::ScrollViewCustomEffect::FlagSwingAngleMask | Toolkit::ScrollViewCustomEffect::FlagSwingAngleIn)) // reset all rotation flags except RotateOut, since they may be calling these functions separately
- | Toolkit::ScrollViewCustomEffect::FlagSwingAngle
- | Toolkit::ScrollViewCustomEffect::FlagSwingAngleOut;
-
- mSwingAngleOut = angle;
- mSwingAxisOut = axis;
-}
-
-void ScrollViewCustomEffect::SetSwingAngleAlphaFunction(AlphaFunction func)
-{
- if(func)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagSwingAngleAlphaFunctionMask;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagSwingAngleAlphaFunctionMask;
- }
- mSwingAlphaFunctionIn = mSwingAlphaFunctionOut = func;
-}
-
-void ScrollViewCustomEffect::SetSwingAngleAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut)
-{
- if(funcIn)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagSwingAngleAlphaFunctionIn;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagSwingAngleAlphaFunctionIn;
- }
- if(funcOut)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagSwingAngleAlphaFunctionOut;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagSwingAngleAlphaFunctionOut;
- }
- mSwingAlphaFunctionIn = funcIn;
- mSwingAlphaFunctionOut = funcOut;
-}
-
-void ScrollViewCustomEffect::SetSwingAngleAlphaFunctionIn(AlphaFunction func)
-{
- if(func)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagSwingAngleAlphaFunctionIn;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagSwingAngleAlphaFunctionIn;
- }
- mSwingAlphaFunctionIn = func;
-}
-
-void ScrollViewCustomEffect::SetSwingAngleAlphaFunctionOut(AlphaFunction func)
-{
- if(func)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagSwingAngleAlphaFunctionOut;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagSwingAngleAlphaFunctionOut;
- }
- mSwingAlphaFunctionOut = func;
-}
-
-void ScrollViewCustomEffect::SetSwingAnchor(const Vector3& anchor)
-{
- mFlags = (mFlags & ~Toolkit::ScrollViewCustomEffect::FlagSwingAnchorMask)
- | Toolkit::ScrollViewCustomEffect::FlagSwingAnchor;
- mSwingAnchorIn = mSwingAnchorOut = anchor;
-}
-
-void ScrollViewCustomEffect::SetSwingAnchor(const Vector3& anchorIn, const Vector3& anchorOut)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & ~Toolkit::ScrollViewCustomEffect::FlagSwingAnchorMask)
- | Toolkit::ScrollViewCustomEffect::FlagSwingAnchor
- | Toolkit::ScrollViewCustomEffect::FlagSwingAnchorIn
- | Toolkit::ScrollViewCustomEffect::FlagSwingAnchorOut;
-
- mSwingAnchorIn = anchorIn;
- mSwingAnchorOut = anchorOut;
-}
-
-void ScrollViewCustomEffect::SetSwingAnchorIn(const Vector3& anchor)
-{
- mFlags = (mFlags & (~Toolkit::ScrollViewCustomEffect::FlagSwingAnchorMask | Toolkit::ScrollViewCustomEffect::FlagSwingAnchorOut))
- | Toolkit::ScrollViewCustomEffect::FlagSwingAnchor
- | Toolkit::ScrollViewCustomEffect::FlagSwingAnchorIn;
-
- mSwingAnchorIn = anchor;
-}
-
-void ScrollViewCustomEffect::SetSwingAnchorOut(const Vector3& anchor)
-{
- mFlags = (mFlags & (~Toolkit::ScrollViewCustomEffect::FlagSwingAnchorMask | Toolkit::ScrollViewCustomEffect::FlagSwingAnchorIn))
- | Toolkit::ScrollViewCustomEffect::FlagSwingAnchor
- | Toolkit::ScrollViewCustomEffect::FlagSwingAnchorOut;
-
- mSwingAnchorOut = anchor;
-}
-
-void ScrollViewCustomEffect::SetSwingAnchorAlphaFunction(AlphaFunction func)
-{
- if(func)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagSwingAnchorAlphaFunctionMask;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagSwingAnchorAlphaFunctionMask;
- }
- mSwingAnchorAlphaFunctionIn = mSwingAnchorAlphaFunctionOut = func;
-}
-
-void ScrollViewCustomEffect::SetSwingAnchorAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut)
-{
- if(funcIn)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagSwingAnchorAlphaFunctionIn;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagSwingAnchorAlphaFunctionIn;
- }
- if(funcOut)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagSwingAnchorAlphaFunctionOut;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagSwingAnchorAlphaFunctionOut;
- }
- mSwingAnchorAlphaFunctionIn = funcIn;
- mSwingAnchorAlphaFunctionOut = funcOut;
-}
-
-void ScrollViewCustomEffect::SetSwingAnchorAlphaFunctionIn(AlphaFunction func)
-{
- if(func)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagSwingAnchorAlphaFunctionIn;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagSwingAnchorAlphaFunctionIn;
- }
- mSwingAnchorAlphaFunctionIn = func;
-}
-
-void ScrollViewCustomEffect::SetSwingAnchorAlphaFunctionOut(AlphaFunction func)
-{
- if(func)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagSwingAnchorAlphaFunctionOut;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagSwingAnchorAlphaFunctionOut;
- }
- mSwingAnchorAlphaFunctionOut = func;
-}
-
-void ScrollViewCustomEffect::SetOpacityThreshold(float thresh)
-{
- mFlags = (mFlags & ~Toolkit::ScrollViewCustomEffect::FlagOpacityThresholdMask)
- | Toolkit::ScrollViewCustomEffect::FlagOpacityThreshold
- | Toolkit::ScrollViewCustomEffect::FlagOpacityThresholdIn
- | Toolkit::ScrollViewCustomEffect::FlagOpacityThresholdOut;
-
- mOpacityThresholdIn = mOpacityThresholdOut = thresh;
-}
-
-void ScrollViewCustomEffect::SetOpacityThreshold(float threshIn, float threshOut)
-{
- // set flags describing translation with separate in out translation
- mFlags = (mFlags & ~Toolkit::ScrollViewCustomEffect::FlagOpacityThresholdMask)
- | Toolkit::ScrollViewCustomEffect::FlagOpacityThreshold
- | Toolkit::ScrollViewCustomEffect::FlagOpacityThresholdIn
- | Toolkit::ScrollViewCustomEffect::FlagOpacityThresholdOut;
-
- mOpacityThresholdIn = threshIn;
- mOpacityThresholdOut = threshOut;
-}
-
-void ScrollViewCustomEffect::SetOpacityThresholdIn(float thresh)
-{
- mFlags = (mFlags & (~Toolkit::ScrollViewCustomEffect::FlagOpacityThresholdMask | Toolkit::ScrollViewCustomEffect::FlagOpacityThresholdOut))
- | Toolkit::ScrollViewCustomEffect::FlagOpacityThreshold
- | Toolkit::ScrollViewCustomEffect::FlagOpacityThresholdIn;
-
- mOpacityThresholdIn = thresh;
-}
-
-void ScrollViewCustomEffect::SetOpacityThresholdOut(float thresh)
-{
- mFlags = (mFlags & (~Toolkit::ScrollViewCustomEffect::FlagOpacityThresholdMask | Toolkit::ScrollViewCustomEffect::FlagOpacityThresholdIn))
- | Toolkit::ScrollViewCustomEffect::FlagOpacityThreshold
- | Toolkit::ScrollViewCustomEffect::FlagOpacityThresholdOut;
-
- mOpacityThresholdOut = thresh;
-}
-
-void ScrollViewCustomEffect::SetOpacityAlphaFunction(AlphaFunction func)
-{
- if(func)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagOpacityAlphaFunctionMask;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagOpacityAlphaFunctionMask;
- }
- mOpacityAlphaFunctionIn = mOpacityAlphaFunctionOut = func;
-}
-
-void ScrollViewCustomEffect::SetOpacityAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut)
-{
- if(funcIn)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagOpacityAlphaFunctionIn;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagOpacityAlphaFunctionIn;
- }
- if(funcOut)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagOpacityAlphaFunctionOut;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagOpacityAlphaFunctionOut;
- }
- mOpacityAlphaFunctionIn = funcIn;
- mOpacityAlphaFunctionOut = funcOut;
-}
-
-void ScrollViewCustomEffect::SetOpacityAlphaFunctionIn(AlphaFunction func)
-{
- if(func)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagOpacityAlphaFunctionIn;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagOpacityAlphaFunctionIn;
- }
- mOpacityAlphaFunctionIn = func;
-}
-
-void ScrollViewCustomEffect::SetOpacityAlphaFunctionOut(AlphaFunction func)
-{
- if(func)
- {
- mFlags |= Toolkit::ScrollViewCustomEffect::FlagOpacityAlphaFunctionOut;
- }
- else
- {
- mFlags &= ~Toolkit::ScrollViewCustomEffect::FlagOpacityAlphaFunctionOut;
- }
- mOpacityAlphaFunctionOut = func;
-}
-
-void ScrollViewCustomEffect::ApplyToPage( Actor page, Vector3 pageSize)
-{
- // may have already called register for these properties, so check before registering
- Dali::Toolkit::ScrollView scrollView = GetScrollView();
- Property::Index scrollPropertyIndex = page.GetPropertyIndex(SCROLL_AMOUNT_PROPERTY_STRING);
- if(scrollPropertyIndex == Property::INVALID_INDEX)
- {
- scrollPropertyIndex = page.RegisterProperty(SCROLL_AMOUNT_PROPERTY_STRING, Vector3::ZERO);
- }
-
- Property::Index anchorPropertyIndex = page.GetPropertyIndex(ANCHOR_POINT_PROPERTY_STRING);
- if(anchorPropertyIndex == Property::INVALID_INDEX)
- {
- anchorPropertyIndex = page.RegisterProperty(ANCHOR_POINT_PROPERTY_STRING, Vector3::ZERO);
- }
-
- ScrollViewCustomEffectInfoPtr info(new ScrollViewCustomEffectInfo(
- mFlags,
- scrollPropertyIndex,
- anchorPropertyIndex,
- mPageSpacing,
- mTranslateIn, mTranslateOut,
- mGlobalRotateIn, mGlobalRotateOut,
- mGlobalOriginIn, mGlobalOriginOut,
- mSwingAngleIn, mSwingAxisIn, mSwingAngleOut, mSwingAxisOut,
- mSwingAnchorIn - AnchorPoint::CENTER, mSwingAnchorOut - AnchorPoint::CENTER,
- mOpacityThresholdIn, mOpacityThresholdOut,
- mGlobalRotateAlphaFunctionIn, mGlobalRotateAlphaFunctionOut,
- mSwingAlphaFunctionIn, mSwingAlphaFunctionOut,
- mSwingAnchorAlphaFunctionIn, mSwingAnchorAlphaFunctionOut,
- mTranslateAlphaFunctionIn, mTranslateAlphaFunctionOut,
- mOpacityAlphaFunctionIn, mOpacityAlphaFunctionOut));
-
- ScrollViewCustomEffectInfo effectInfo( *info );
- Property::Index scrollAmountProperty = effectInfo.mScrollAmountProperty;
- Property::Index anchProperty = effectInfo.mAnchorProperty;
- // Apply constraints to this actor //
- Constraint constraint;
- constraint = Constraint::New<Vector3>( scrollAmountProperty,
- LocalSource(Actor::POSITION),
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ),
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_MIN_PROPERTY_NAME ) ),
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_MAX_PROPERTY_NAME ) ),
- Source(scrollView, Actor::SIZE ),
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_WRAP_PROPERTY_NAME ) ),
- boost::bind( &ScrollViewCustomEffectInfo::ScrollAmountConstraint, info, _1, _2, _3, _4, _5, _6, _7) );
-
- constraint.SetRemoveAction( Constraint::Discard );
- page.ApplyConstraint( constraint );
-
- constraint = Constraint::New<Quaternion>( Actor::ROTATION,
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ),
- Source( scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_PANNING_PROPERTY_NAME ) ),
- Source( scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_SCROLLING_PROPERTY_NAME ) ),
- boost::bind( &ScrollViewCustomEffectInfo::PageDirectionAndRotationConstraint, info, _1, _2, _3, _4) );
-
- constraint.SetRemoveAction( Constraint::Discard );
- page.ApplyConstraint( constraint );
-
- constraint = Constraint::New<Vector4>( Actor::COLOR,
- Source(page, scrollAmountProperty ),
- boost::bind( &ScrollViewCustomEffectInfo::ColorConstraint, info, _1, _2) );
-
- constraint.SetRemoveAction( Constraint::Discard );
- page.ApplyConstraint( constraint );
-
- constraint = Constraint::New<Vector3>( Actor::POSITION,
- Source(page, scrollAmountProperty ),
- Source(page, anchProperty ),
- LocalSource(Actor::ROTATION),
- boost::bind( &ScrollViewCustomEffectInfo::PositionConstraint, info, _1, _2, _3, _4) );
-
- constraint.SetRemoveAction( Constraint::Discard );
- page.ApplyConstraint( constraint );
-}
-
-void ScrollViewCustomEffect::OnAttach(Toolkit::ScrollView& scrollView)
-{
-}
-
-void ScrollViewCustomEffect::OnDetach(Toolkit::ScrollView& scrollView)
-{
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
+++ /dev/null
-#ifndef __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_CUSTOM_EFFECT_H__
-#define __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_CUSTOM_EFFECT_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.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/public-api/animation/animation.h>
-#include <dali/public-api/animation/alpha-functions.h>
-#include <dali/public-api/animation/time-period.h>
-#include <dali/public-api/object/ref-object.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h>
-#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
-
-namespace Dali
-{
-
-class Animation;
-
-namespace Toolkit
-{
-
-class ScrollGroup;
-class ScrollView;
-
-namespace Internal
-{
-
-/**
- * @copydoc Toolkit::ScrollViewCustomEffect
- */
-class ScrollViewCustomEffect : public ScrollViewEffect
-{
- static const std::string SCROLL_AMOUNT_PROPERTY_STRING;
- static const std::string ANCHOR_POINT_PROPERTY_STRING;
-
-public:
-
- /**
- * Constructor
- */
- ScrollViewCustomEffect();
-
-public:
-
- /**
- * @brief SetPageSpacing
- * @param spacing
- */
- void SetPageSpacing(const Vector2& spacing);
-
- /**
- * @brief SetPageTranslation sets a simple translate on/off value
- * @param translation
- */
- void SetPageTranslation(const Vector3& translation);
-
- /**
- * @brief SetPageTranslation
- * @param translationIn
- * @param translationOut
- */
- void SetPageTranslation(const Vector3& translationIn, const Vector3& translationOut);
-
- /**
- * @brief SetPageTranslationIn
- * @param translation
- */
- void SetPageTranslationIn(const Vector3& translation);
-
- /**
- * @brief SetPageTranslationOut
- * @param translation
- */
- void SetPageTranslationOut(const Vector3& translation);
-
- /**
- * @brief SetPageTranslateAlphaFunction
- * @param func
- */
- void SetPageTranslateAlphaFunction(AlphaFunction func);
-
- /**
- * @brief SetPageTranslateAlphaFunction
- * @param funcIn
- * @param funcOut
- */
- void SetPageTranslateAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut);
-
- /**
- * @brief SetPageTranslateAlphaFunctionIn
- * @param func
- */
- void SetPageTranslateAlphaFunctionIn(AlphaFunction func);
-
- /**
- * @brief SetPageTranslateAlphaFunctionOut
- * @param func
- */
- void SetPageTranslateAlphaFunctionOut(AlphaFunction func);
-
- /**
- * @brief SetGlobalPageRotation
- * @param angle
- * @param axis
- */
- void SetGlobalPageRotation(float angle, const Vector3& axis);
-
- /**
- * @brief SetAnglePageRotation uses the angle and page size passed in on creation to create a faked origin (inner cube needs this method)
- * @param angle
- */
- void SetAngledOriginPageRotation(const Vector3& angle);
-
- /**
- * @brief SetGlobalPageRotation
- * @param angleIn
- * @param axisIn
- * @param angleOut
- * @param axisOut
- */
- void SetGlobalPageRotation(float angleIn, const Vector3& axisIn, float angleOut, const Vector3& axisOut);
-
- /**
- * @brief SetGlobalPageRotationIn
- * @param angle
- * @param axis
- */
- void SetGlobalPageRotationIn(float angle, const Vector3& axis);
-
- /**
- * @brief SetGlobalPageRotationOut
- * @param angle
- * @param axis
- */
- void SetGlobalPageRotationOut(float angle, const Vector3& axis);
-
- /**
- * @brief SetPageRotationOrigin Set the origin to rotate all the pages around
- * - The default value is (0,0,0)
- * @param origin
- */
- void SetGlobalPageRotationOrigin(const Vector3& origin);
-
- /**
- * @brief SetGlobalPageRotationOrigin
- * @param originIn
- * @param originOut
- */
- void SetGlobalPageRotationOrigin(const Vector3& originIn, const Vector3& originOut);
-
- /**
- * @brief SetGlobalPageRotationOriginIn
- * @param origin
- */
- void SetGlobalPageRotationOriginIn(const Vector3& origin);
-
- /**
- * @brief SetGlobalPageRotationOriginOut
- * @param origin
- */
- void SetGlobalPageRotationOriginOut(const Vector3& origin);
-
- /**
- * @brief SetSwingAngle
- * @param angle
- * @param axis
- */
- void SetSwingAngle(const float angle, const Vector3& axis);
-
- /**
- * @brief SetSwingAngle
- * @param angleIn
- * @param axisIn
- * @param angleOut
- * @param axisOut
- */
- void SetSwingAngle(float angleIn, const Vector3& axisIn, float angleOut, const Vector3& axisOut);
-
- /**
- * @brief SetSwingAngleIn
- * @param angle
- * @param axis
- */
- void SetSwingAngleIn(float angle, const Vector3& axis);
-
- /**
- * @brief SetSwingAngleOut
- * @param angle
- * @param axis
- */
- void SetSwingAngleOut(float angle, const Vector3& axis);
-
- /**
- * @brief SetSwingAngleAlphaFunction
- * @param func
- */
- void SetSwingAngleAlphaFunction(AlphaFunction func);
-
- /**
- * @brief SetSwingAngleAlphaFunction
- * @param funcIn
- * @param funcOut
- */
- void SetSwingAngleAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut);
-
- /**
- * @brief SetSwingAngleAlphaFunctionIn
- * @param func
- */
- void SetSwingAngleAlphaFunctionIn(AlphaFunction func);
-
- /**
- * @brief SetSwingAngleAlphaFunctionOut
- * @param func
- */
- void SetSwingAngleAlphaFunctionOut(AlphaFunction func);
-
- /**
- * @brief SetSwingAnchor
- * @param anchor
- */
- void SetSwingAnchor(const Vector3& anchor);
-
- /**
- * @brief SetSwingAnchor
- * @param anchorIn
- * @param anchorOut
- */
- void SetSwingAnchor(const Vector3& anchorIn, const Vector3& anchorOut);
-
- /**
- * @brief SetSwingAnchorIn
- * @param anchor
- */
- void SetSwingAnchorIn(const Vector3& anchor);
-
- /**
- * @brief SetSwingAnchorOut
- * @param anchor
- */
- void SetSwingAnchorOut(const Vector3& anchor);
-
- /**
- * @brief SetSwingAnchorAlphaFunction
- * @param func
- */
- void SetSwingAnchorAlphaFunction(AlphaFunction func);
-
- /**
- * @brief SetSwingAnchorAlphaFunction
- * @param funcIn
- * @param funcOut
- */
- void SetSwingAnchorAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut);
-
- /**
- * @brief SetSwingAnchorAlphaFunctionIn
- * @param func
- */
- void SetSwingAnchorAlphaFunctionIn(AlphaFunction func);
-
- /**
- * @brief SetSwingAnchorAlphaFunctionOut
- * @param func
- */
- void SetSwingAnchorAlphaFunctionOut(AlphaFunction func);
-
- /**
- * @brief SetOpacityThreshold
- * @param thresh
- */
- void SetOpacityThreshold(float thresh);
-
- /**
- * @brief SetOpacityThreshold
- * @param threshIn
- * @param threshOut
- */
- void SetOpacityThreshold(float threshIn, float threshOut);
-
- /**
- * @brief SetOpacityThresholdIn
- * @param thresh
- */
- void SetOpacityThresholdIn(float thresh);
-
- /**
- * @brief SetOpacityThresholdOut
- * @param thresh
- */
- void SetOpacityThresholdOut(float thresh);
-
- /**
- * @brief SetOpacityAlphaFunction
- * @param func
- */
- void SetOpacityAlphaFunction(AlphaFunction func);
-
- /**
- * @brief SetOpacityAlphaFunction
- * @param funcIn
- * @param funcOut
- */
- void SetOpacityAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut);
-
- /**
- * @brief SetOpacityAlphaFunctionIn
- * @param func
- */
- void SetOpacityAlphaFunctionIn(AlphaFunction func);
-
- /**
- * @brief SetOpacityAlphaFunctionOut
- * @param func
- */
- void SetOpacityAlphaFunctionOut(AlphaFunction func);
-
-
- /**
- * ApplyToPage This is the full internal ApplyToPage function and ALL other ApplyToPage
- * functions should call this one. Making this internal allows us to change this function
- * in the future without affecting demo apps
- * @param page
- * @param pageSize
- */
- void ApplyToPage( Actor page, Vector3 pageSize);
-
- /**
- * @copydoc ScrollViewEffect::OnAttach
- */
- virtual void OnAttach( Toolkit::ScrollView& scrollView );
-
- /**
- * @copydoc ScrollViewEffect::OnDetach
- */
- virtual void OnDetach( Toolkit::ScrollView& scrollView );
-
-protected:
-
- /**
- * A reference counted object may only be deleted by calling Unreference()
- */
- virtual ~ScrollViewCustomEffect();
-
-private:
-
- Vector3 mPageSize; ///< The logical page size for the 3D effect.
-
- uint mFlags; ///< flags describing functionality, set automatically depending on functions called during effect setup
- Vector2 mPageSpacing; ///< space between pages... kinda obvious really
- Vector3 mTranslateIn; ///< translation offset to use when scrolling a page onto the screen
- Vector3 mTranslateOut; ///< translation offset to use when scrolling a page off the screen
- Quaternion mGlobalRotateIn; ///< rotates the page's position around a point
- Quaternion mGlobalRotateOut; ///< rotates the page's position around a point
- Vector3 mGlobalOriginIn; ///< the point to rotate a page around when scrolling onto screen
- Vector3 mGlobalOriginOut; ///< the point to rotate a page around when scrolling off screen
- float mSwingAngleIn; ///< angle to rotate a page around its anchor when scrolling onto screen
- Vector3 mSwingAxisIn;
- float mSwingAngleOut; ///< angle to rotate a page around its anchor when scrolling off screen
- Vector3 mSwingAxisOut;
- Vector3 mSwingAnchorIn; ///< the page anchor point to use when scrolling onto screen
- Vector3 mSwingAnchorOut; ///< the page anchor point to use when scrolling off screen
- float mOpacityThresholdIn; ///< the point at which opacity will change as page scrolls onto screen
- float mOpacityThresholdOut; ///< the point at which opacity will change as page scrolls off screen
- AlphaFunction mGlobalRotateAlphaFunctionIn;
- AlphaFunction mGlobalRotateAlphaFunctionOut;
- AlphaFunction mSwingAlphaFunctionIn;
- AlphaFunction mSwingAlphaFunctionOut;
- AlphaFunction mSwingAnchorAlphaFunctionIn;
- AlphaFunction mSwingAnchorAlphaFunctionOut;
- AlphaFunction mTranslateAlphaFunctionIn;
- AlphaFunction mTranslateAlphaFunctionOut;
- AlphaFunction mOpacityAlphaFunctionIn;
- AlphaFunction mOpacityAlphaFunctionOut;
-};
-
-} // namespace Internal
-
-// Helpers for public-api forwarding methods
-
-inline Internal::ScrollViewCustomEffect& GetImpl(Dali::Toolkit::ScrollViewCustomEffect& obj)
-{
- DALI_ASSERT_ALWAYS(obj);
-
- Dali::RefObject& handle = obj.GetBaseObject();
-
- return static_cast<Internal::ScrollViewCustomEffect&>(handle);
-}
-
-inline const Internal::ScrollViewCustomEffect& GetImpl(const Dali::Toolkit::ScrollViewCustomEffect& obj)
-{
- DALI_ASSERT_ALWAYS(obj);
-
- const Dali::RefObject& handle = obj.GetBaseObject();
-
- return static_cast<const Internal::ScrollViewCustomEffect&>(handle);
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_CUSTOM_EFFECT_H__
GetImpl(effect).Attach(self);
}
-Toolkit::ScrollViewEffect ScrollView::ApplyEffect(Toolkit::ScrollView::PageEffect effect)
-{
- Toolkit::ScrollViewEffect scrollEffect;
- switch(effect)
- {
- case Toolkit::ScrollView::PageEffectNone:
- {
- break;
- }
- case Toolkit::ScrollView::PageEffectOuterCube:
- {
- Toolkit::ScrollViewCustomEffect customEffect;
- scrollEffect = customEffect = Toolkit::ScrollViewCustomEffect::New();
- Vector2 pageSize = Stage::GetCurrent().GetSize();
- // set the page translation to the slide off distance, also add an extra value to space the pages, having a smaller spacing on translationOut will allow the spacing to reduce over time
- // the page moving onto screen will start 50.0f further out (1.0f * 50.0f) and the spacing will reduce as its position reaches the centre (0.0f * 50.0f)
- // the page moving off screen will slowly build a spacing from 0.0f to 20.0f
- // the spacing from each page is added together for the final spacing between the two pages.
- customEffect.SetPageTranslation(Vector3(pageSize.x, pageSize.y, 0) + Vector3(50.0f, 50.0f, 0.0f), Vector3(pageSize.x, pageSize.y, 0) + Vector3(20.0f, 20.0f, 0.0f));
- customEffect.SetSwingAngleOut(ANGLE_CUSTOM_CUBE_SWING.x, Vector3(0.0f, -1.0f, 0.0f));
- customEffect.SetSwingAnchor(AnchorPoint::CENTER, AnchorPoint::CENTER_LEFT);
- customEffect.SetOpacityThreshold(0.7f);
- break;
- }
- case Toolkit::ScrollView::PageEffectDepth:
- {
- Toolkit::ScrollViewCustomEffect customEffect;
- scrollEffect = customEffect = Toolkit::ScrollViewCustomEffect::New();
- break;
- }
- case Toolkit::ScrollView::PageEffectInnerCube:
- {
- Toolkit::ScrollViewCustomEffect customEffect;
- scrollEffect = customEffect = Toolkit::ScrollViewCustomEffect::New();
- customEffect.SetPageSpacing(Vector2(30.0f, 30.0f));
- customEffect.SetAngledOriginPageRotation(ANGLE_CUBE_PAGE_ROTATE);
- customEffect.SetSwingAngle(ANGLE_CUBE_PAGE_ROTATE.x, Vector3(0,-1,0));
- customEffect.SetOpacityThreshold(0.5f);
- break;
- }
- case Toolkit::ScrollView::PageEffectCarousel:
- {
- Toolkit::ScrollViewCustomEffect customEffect;
- scrollEffect = customEffect = Toolkit::ScrollViewCustomEffect::New();
- customEffect.SetPageTranslation(Vector3(0,0,0), Vector3(-30, 0, 0));
- customEffect.SetPageSpacing(Vector2(60.0f, 60.0f));
- customEffect.SetAngledOriginPageRotation(-ANGLE_CUBE_PAGE_ROTATE);
- customEffect.SetOpacityThreshold(0.2f, 0.6f);
- break;
- }
- case Toolkit::ScrollView::PageEffectSpiral:
- {
- Toolkit::ScrollViewCustomEffect customEffect;
- scrollEffect = customEffect = Toolkit::ScrollViewCustomEffect::New();
-
- Vector2 pageSize = Stage::GetCurrent().GetSize();
- customEffect.SetSwingAngle(-ANGLE_SPIRAL_SWING_IN.x, Vector3(0.0f, -1.0f, 0.0f), ANGLE_SPIRAL_SWING_OUT.x, Vector3(0.0f, -1.0f, 0.0f));
- //customEffect.SetSwingAngleAlphaFunctionOut(AlphaFunctions::EaseOut);
- customEffect.SetSwingAnchor(AnchorPoint::CENTER_RIGHT);
- customEffect.SetPageTranslation(Vector3(pageSize.x, pageSize.y, 0) + Vector3(100.0f, 100.0f, 0.0f), Vector3(pageSize.x, pageSize.y, -pageSize.y * 2.0f) * 0.33f);
- //customEffect.SetPageTranslateAlphaFunctionOut(AlphaFunctions::EaseOut);
- customEffect.SetOpacityThreshold(0.75f, 0.6f);
- customEffect.SetOpacityAlphaFunctionIn(AlphaFunctions::EaseInOut);
- break;
- }
- default:
- {
- DALI_ASSERT_DEBUG(0 && "unknown scroll view effect");
- }
- }
- RemoveConstraintsFromChildren();
- if(scrollEffect)
- {
- ApplyEffect(scrollEffect);
- }
- return scrollEffect;
-}
-
void ScrollView::RemoveEffect(Toolkit::ScrollViewEffect effect)
{
Dali::Toolkit::ScrollView self = Dali::Toolkit::ScrollView::DownCast(Self());
{
// set mScrolling to false, in case user has code that interrogates mScrolling Getter() in complete.
mScrolling = false;
- DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignalV2 1 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y);
- mScrollCompletedSignalV2.Emit( currentScrollPosition );
+ DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignal 1 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y);
+ mScrollCompletedSignal.Emit( currentScrollPosition );
}
if( mPanning ) // are we interrupting a current pan?
self.SetProperty(mPropertyScrolling, true);
mScrolling = true;
- DALI_LOG_SCROLL_STATE("[0x%X] mScrollStartedSignalV2 1 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y);
- mScrollStartedSignalV2.Emit( currentScrollPosition );
+ DALI_LOG_SCROLL_STATE("[0x%X] mScrollStartedSignal 1 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y);
+ mScrollStartedSignal.Emit( currentScrollPosition );
bool animating = AnimateTo(-position,
Vector3::ONE * duration,
alpha,
completedPosition = position;
}
- DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignalV2 2 [%.2f, %.2f]", this, completedPosition.x, completedPosition.y);
+ DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignal 2 [%.2f, %.2f]", this, completedPosition.x, completedPosition.y);
SetScrollUpdateNotification(false);
- mScrollCompletedSignalV2.Emit( completedPosition );
+ mScrollCompletedSignal.Emit( completedPosition );
}
}
snapEvent.position = -mScrollTargetPosition;
snapEvent.duration = totalDuration;
- DALI_LOG_SCROLL_STATE("[0x%X] mSnapStartedSignalV2 [%.2f, %.2f]", this, snapEvent.position.x, snapEvent.position.y);
- mSnapStartedSignalV2.Emit( snapEvent );
+ DALI_LOG_SCROLL_STATE("[0x%X] mSnapStartedSignal [%.2f, %.2f]", this, snapEvent.position.x, snapEvent.position.y);
+ mSnapStartedSignal.Emit( snapEvent );
return (mScrollStateFlags & SCROLL_ANIMATION_FLAGS) != 0;
}
panGesture.RemoveDirection( direction );
}
-Toolkit::ScrollView::SnapStartedSignalV2& ScrollView::SnapStartedSignal()
+Toolkit::ScrollView::SnapStartedSignalType& ScrollView::SnapStartedSignal()
{
- return mSnapStartedSignalV2;
+ return mSnapStartedSignal;
}
void ScrollView::FindAndUnbindActor(Actor child)
self.SetProperty(mPropertyPrePosition, mScrollPrePosition);
Vector3 currentScrollPosition = GetCurrentScrollPosition();
- DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignalV2 3 current[%.2f, %.2f], mScrollTargetPosition[%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y, -mScrollTargetPosition.x, -mScrollTargetPosition.y );
- mScrollCompletedSignalV2.Emit( currentScrollPosition );
+ DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignal 3 current[%.2f, %.2f], mScrollTargetPosition[%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y, -mScrollTargetPosition.x, -mScrollTargetPosition.y );
+ mScrollCompletedSignal.Emit( currentScrollPosition );
mDomainOffset += deltaPosition - mScrollPostPosition;
self.SetProperty(mPropertyDomainOffset, mDomainOffset);
Toolkit::ScrollView handle( GetOwner() );
Vector3 currentScrollPosition = GetCurrentScrollPosition();
- mScrollUpdatedSignalV2.Emit( currentScrollPosition );
+ mScrollUpdatedSignal.Emit( currentScrollPosition );
}
bool ScrollView::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
UpdateLocalScrollProperties();
Vector3 currentScrollPosition = GetCurrentScrollPosition();
- DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignalV2 4 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y);
- mScrollCompletedSignalV2.Emit( currentScrollPosition );
+ DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignal 4 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y);
+ mScrollCompletedSignal.Emit( currentScrollPosition );
}
}
mScrolling = false;
// send negative scroll position since scroll internal scroll position works as an offset for actors,
// give applications the position within the domain from the scroll view's anchor position
- DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignalV2 5 [%.2f, %.2f]", this, -mScrollPostPosition.x, -mScrollPostPosition.y);
- mScrollCompletedSignalV2.Emit( -mScrollPostPosition );
+ DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignal 5 [%.2f, %.2f]", this, -mScrollPostPosition.x, -mScrollPostPosition.y);
+ mScrollCompletedSignal.Emit( -mScrollPostPosition );
}
}
}
Vector3 currentScrollPosition = GetCurrentScrollPosition();
Self().SetProperty(mPropertyScrolling, true);
mScrolling = true;
- DALI_LOG_SCROLL_STATE("[0x%X] mScrollStartedSignalV2 2 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y);
- mScrollStartedSignalV2.Emit( currentScrollPosition );
+ DALI_LOG_SCROLL_STATE("[0x%X] mScrollStartedSignal 2 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y);
+ mScrollStartedSignal.Emit( currentScrollPosition );
}
else if( (state == Gesture::Finished) ||
(state == Gesture::Cancelled) ) // Finished/default
SnapInternalYTo(mScrollTargetPosition.y);
}
Vector3 currentScrollPosition = GetCurrentScrollPosition();
- DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignalV2 6 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y);
- mScrollCompletedSignalV2.Emit( currentScrollPosition );
+ DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignal 6 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y);
+ mScrollCompletedSignal.Emit( currentScrollPosition );
}
}
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
-// predefined effect includes
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h>
-
namespace Dali
{
void ApplyEffect(Toolkit::ScrollViewEffect effect);
/**
- * @brief ApplyEffect Applies a predefined effect
- * @param effect
- */
- Toolkit::ScrollViewEffect ApplyEffect(Toolkit::ScrollView::PageEffect effect);
-
- /**
* @copydoc Toolkit::ScrollView::RemoveEffect
*/
void RemoveEffect(Toolkit::ScrollViewEffect effect);
/**
* @copydoc Dali::Toolkit::ScrollView::SnapStartedSignal()
*/
- Toolkit::ScrollView::SnapStartedSignalV2& SnapStartedSignal();
+ Toolkit::ScrollView::SnapStartedSignalType& SnapStartedSignal();
/**
* Connects a callback function with the object's signals.
ScrollOvershootIndicatorPtr mOvershootIndicator;
- Toolkit::ScrollView::SnapStartedSignalV2 mSnapStartedSignalV2;
+ Toolkit::ScrollView::SnapStartedSignalType mSnapStartedSignal;
bool mInAccessibilityPan : 1; ///< With AccessibilityPan its easier to move between snap positions
bool mInitialized:1;
* When at middle of the screen the position is not altered.
* When one screen away from middle the position is rotated as per expected in a 3D carousel.
*/
-class ScrollPageCarouselEffectInfo : public Dali::RefObject
+class ScrollPageCarouselEffectInfo
{
public:
const Vector2 mPositionToPageSizeRatio; ///< The page will move its position according to this ratio.
};
-typedef IntrusivePtr<ScrollPageCarouselEffectInfo> ScrollPageCarouselEffectInfoPtr;
-
/**
* Helper: Applies the 3D scroll cube constraints to the child actor
*
*/
void ApplyScrollCubeConstraints(Toolkit::ScrollView scrollView,
Actor child,
- ScrollPageCarouselEffectInfoPtr info)
+ ScrollPageCarouselEffectInfo& info)
{
// Apply constraints to this actor //
Constraint constraint;
void ScrollViewPageCarouselEffect::ApplyToPage( Actor page, const Vector2& positionToPageSizeRatio )
{
- ScrollPageCarouselEffectInfoPtr info(new ScrollPageCarouselEffectInfo( positionToPageSizeRatio ) );
+ ScrollPageCarouselEffectInfo info( positionToPageSizeRatio );
ApplyScrollCubeConstraints( GetScrollView(), page, info );
}
* When at middle of the screen the position is not altered.
* When one screen away from middle the position is rotated as per expected in a 3D inner cube.
*/
-class ScrollPageCubeEffectInfo : public Dali::RefObject
+class ScrollPageCubeEffectInfo
{
public:
Vector2 mAngleSwing; ///< Maximum amount in X and Y axes to rotate.
};
-typedef IntrusivePtr<ScrollPageCubeEffectInfo> ScrollPageCubeEffectInfoPtr;
-
/**
* Helper: Applies the 3D scroll cube constraints to the child actor
*
*/
void ApplyScrollCubeConstraints(Toolkit::ScrollView scrollView,
Actor child,
- ScrollPageCubeEffectInfoPtr info)
+ ScrollPageCubeEffectInfo& info)
{
// Apply constraints to this actor //
Constraint constraint;
void ScrollViewPageCubeEffect::ApplyToPage( Actor page, const Vector2& angleSwing )
{
- ScrollPageCubeEffectInfoPtr info(new ScrollPageCubeEffectInfo( angleSwing ));
+ ScrollPageCubeEffectInfo info( angleSwing );
ApplyScrollCubeConstraints( GetScrollView(), page, info );
}
* relative to the middle of the screen.
* When at middle of the screen the position is not altered.
*/
-class ScrollPageSpiralEffectInfo : public Dali::RefObject
+class ScrollPageSpiralEffectInfo
{
public:
bool mScrollWrap; ///< Whether the scroll view wraps or not.
};
-typedef IntrusivePtr<ScrollPageSpiralEffectInfo> ScrollPageSpiralEffectInfoPtr;
-
/**
* Helper: Applies the 3D scroll cube constraints to the child actor
*
*/
void ApplyScrollCubeConstraints(Toolkit::ScrollView scrollView,
Actor child,
- ScrollPageSpiralEffectInfoPtr info)
+ ScrollPageSpiralEffectInfo& info)
{
// Apply constraints to this actor //
Constraint constraint;
if ( scrollView )
{
- ScrollPageSpiralEffectInfoPtr info(new ScrollPageSpiralEffectInfo( spiralAngle, GetImpl( scrollView ).GetWrapMode() ));
+ ScrollPageSpiralEffectInfo info( spiralAngle, GetImpl( scrollView ).GetWrapMode() );
ApplyScrollCubeConstraints( scrollView, page, info );
}
}
+++ /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/scrollable/scroll-view/scroll-view-slide-effect-impl.h>
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/events/touch-event.h>
-#include <dali/public-api/common/stage.h>
-
-// INTERNAL INCLUDES
-
-using namespace Dali;
-
-typedef Dali::Toolkit::Internal::ScrollSlideInfo ScrollSlideInfo;
-typedef Dali::Toolkit::Internal::ScrollSlideInfoPtr ScrollSlideInfoPtr;
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-
-/**
- * ScrollSlideInfo structure contains
- * common info that is shared amongst the constraints applied to Actors.
- * The constraints + effect all share ownership of this info struct.
- * The info is written to by the ScrollSlideInfoUpdate constraint. While
- * the other constraints read from by the other constraints. Due to the order
- * in which the constraints are applied, all constraints will get the current
- * property values for these properties.
- * The advantage of doing this is that:
- * A) Constraints are not restricted by the 6 property limit. to function.
- * B) Properties which rarely change or only change when another property changes
- * (e.g. time), such as scroll position, scroll domain, size, wrap mode don't need
- * to be checked for each constraint to apply.
- */
-class ScrollSlideInfo : public RefObject
-{
-
-public:
-
- /**
- * Constructor
- */
- ScrollSlideInfo()
- : mScrollWrap(false),
- mVertical(false)
- {
- }
-
- /**
- * Destructor
- */
- virtual ~ScrollSlideInfo()
- {
- }
-
-public:
-
- Vector3 mScrollPosition;
- Vector3 mEffectReference;
- Vector3 mScrollSize;
- Vector3 mScrollPositionMin;
- Vector3 mScrollPositionMax;
- bool mScrollWrap;
- bool mVertical;
-
-};
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-
-namespace // unnamed namespace
-{
-
-const float SLIDEEFFECT_ANIMATION_MAX_TIME = 60.0f; ///< Animation time (every time finishes, checks if it needs to go again)
-const float COMPLETION_START_DURATION = 0.25f; ///< Maximum time for completion of effect after scroll-view initially completes (due to delay effect)
-const float COMPLETION_END_DURATION = 5.0f; ///< Maximum time for completion of effect after scroll-view initially completes (due to delay effect)
-const float ANIMATION_BLEND_COEFFICIENT = 0.05f; ///< Animation blending coefficient (blends between target value e.g. 5% and current value 9%)
-const float INV_ANIMATION_BLEND_COEFFICIENT = (1.0f - ANIMATION_BLEND_COEFFICIENT);
-const float DEFAULT_MAX_DELAY_DURATION = 0.25f; ///< Default maximum delay duration of the effect after scroll completes is 0.25f
-const float EFFECT_SNAP_GROW_DURATION = 0.33f; ///< Take 1/3rd of a second for the snap effect property to grow
-const float EFFECT_SNAP_DECAY_DURATION = 0.667f; ///< Take 2/3rds of a second for the snap effect property to decay
-
-/**
- * Gets a property index. If the property doesn't already exist, then
- * it will create the property.
- * @param[in] handle The handle that owns or will own the property
- * @param[in] name The name for this property
- * @param[in] propertyValue The initial value for this property
- * @return The property index for this property is returned.
- */
-Property::Index SafeRegisterProperty( Handle& handle, const std::string& name, Property::Value propertyValue )
-{
- Property::Index index = handle.GetPropertyIndex( name );
-
- if(index == Property::INVALID_INDEX)
- {
- index = handle.RegisterProperty( name, propertyValue );
- }
-
- return index;
-}
-
-/**
- * Re-scales input value x from x0 - x1, to linearly map
- * over the values y0 - y1. Values outside of this range
- * will also conform to the trend (gradient) set.
- * @param[in] y0 output minimum bound
- * @param[in] y1 output maximum bound
- * @param[in] x input X value
- * @param[in] x0 (optional) input minimum bound (default 0.0)
- * @param[in] x1 (optional) input maximum bound (default 1.0)
- * @return The result of the mapping is returned.
- */
-float Mix(float y0, float y1, float x, float x0 = 0.0f, float x1 = 1.0f)
-{
- return y0 + (y1 - y0) * (x - x0) / (x1-x0);
-}
-
-/**
- * Returns the value of x chasing target.
- * returns a value of x which is closer to target.
- * but limited by maxDelta. #
- * For example:
- * x = 10.0f
- * target = 50.0f
- * maxDelta = 20.0f
- * result is 30.0f (x is 20.0f units closer to target)
- * However, if x is already within maxDelta units
- * of target, x will equal target.
- * For example:
- * x = 55.0f
- * target = 50.0f
- * maxDelta = 20.0f
- * result is 50.0f (x was already within 20.0f units of target)
- */
-float Chase( float x, float target, float maxDelta )
-{
- float delta = target - x;
-
- if(delta > 0.0f)
- {
- x = std::min( x + maxDelta, target );
- }
- else
- {
- x = std::max( x - maxDelta, target );
- }
-
- return x;
-}
-
-// constraints ////////////////////////////////////////////////////////////////
-
-/**
- * ScrollSlideInfoUpdate
- *
- * Info constraint updates an info struct with property info,
- * so that constraints can use this instead of having it passed through
- * as parameters.
- */
-struct ScrollSlideInfoUpdate
-{
- /**
- * Constraint constructor
- */
- ScrollSlideInfoUpdate(ScrollSlideInfoPtr scrollInfo)
- : mScrollSlideInfo(scrollInfo)
- {
- }
-
- /**
- * @param[in] current The current value
- * @param[in] scrollPositionProperty The scroll-view's position property (SCROLL_POSITION_PROPERTY_NAME)
- * @param[in] effectReferenceProperty The point in the scroll-view where the user touched the screen
- * @param[in] effectTimeProperty The current timer. Starting from 0.0 when scroll animation/dragging
- * commences. Ensures that constraint is applied and processed every frame (to achieve the delay effect)
- * @param[in] sizeProperty The size of the ScrollView.
- * @return The new position of this Actor.
- */
- float operator()(const float& current,
- const PropertyInput& scrollPositionProperty,
- const PropertyInput& effectReferenceProperty,
- const PropertyInput& scrollSizeProperty,
- const PropertyInput& scrollPositionMinProperty,
- const PropertyInput& scrollPositionMaxProperty,
- const PropertyInput& scrollWrapProperty)
- {
- mScrollSlideInfo->mScrollPosition = scrollPositionProperty.GetVector3();
- mScrollSlideInfo->mEffectReference = effectReferenceProperty.GetVector3();
- mScrollSlideInfo->mScrollSize = scrollSizeProperty.GetVector3();
- mScrollSlideInfo->mScrollPositionMin = scrollPositionMinProperty.GetVector3();
- mScrollSlideInfo->mScrollPositionMax = scrollPositionMaxProperty.GetVector3();
- mScrollSlideInfo->mScrollWrap = scrollWrapProperty.GetBoolean();
-
- return current;
- }
-
-private:
-
- ScrollSlideInfoPtr mScrollSlideInfo;
-
-};
-
-
-/**
- * ScrollSlidePositionConstraint
- *
- * Position constraint adjusts the position of the Actors
- * based on their parent page's position relative to the middle of the screen.
- * When at middle of the screen the position is not altered.
- * When one screen away from middle the position is rotated about it's origin + mAnchor
- */
-struct ScrollSlidePositionConstraint
-{
- /**
- * Constraint constructor
- */
- ScrollSlidePositionConstraint(ScrollSlideInfoPtr scrollInfo, float delayMin, float delayMax)
- : mScrollSlideInfo(scrollInfo),
- mScrollPosition(scrollInfo->mScrollPosition),
- mDelayMin(delayMin),
- mDelayMax(delayMax),
- mAverageSpeed(0.0f)
- {
- }
-
- /**
- * @param[in] current The current position
- * @param[in] scrollPositionProperty The scroll-view's position property (SCROLL_POSITION_PROPERTY_NAME)
- * @param[in] effectReferenceProperty The point in the scroll-view where the user touched the screen
- * @param[in] effectTimeProperty The current timer. Starting from 0.0 when scroll animation/dragging
- * commences. Ensures that constraint is applied and processed every frame (to achieve the delay effect)
- * @param[in] sizeProperty The size of the ScrollView.
- * @return The new position of this Actor.
- */
- Vector3 operator()(const Vector3& current,
- const PropertyInput& pagePositionProperty,
- const PropertyInput& effectTimeProperty,
- const PropertyInput& deltaPositionProperty,
- const PropertyInput& snapProperty)
- {
- const float complete = snapProperty.GetFloat();
- bool activate = (complete > Math::MACHINE_EPSILON_1);
- const Vector3& pagePosition = pagePositionProperty.GetVector3();
- const Vector3& scrollPosition = mScrollSlideInfo->mScrollPosition;
-
- // Get position of page.
- Vector2 relativePosition(pagePosition + scrollPosition);
-
- // short circuit: for orthognal view and when the blending has been deactivated.
- if( (!activate) &&
- (fabsf(relativePosition.x) < Math::MACHINE_EPSILON_1) &&
- (fabsf(relativePosition.y) < Math::MACHINE_EPSILON_1) )
- {
- Vector3 actorPosition(current + scrollPosition);
- return actorPosition;
- }
-
- const Vector3& referencePoint = mScrollSlideInfo->mEffectReference;
- const Vector3& scrollSize = mScrollSlideInfo->mScrollSize;
- const Vector3& deltaPosition = deltaPositionProperty.GetVector3();
-
- // 1. Determine the relative position of the actor from the scrolling reference point.
- // (the further away from the reference, the longer the delay should be)
- const Vector3& min = mScrollSlideInfo->mScrollPositionMin;
- const Vector3& max = mScrollSlideInfo->mScrollPositionMax;
-
- relativePosition.y = (pagePosition.y + current.y - referencePoint.y) / scrollSize.height;
-
- // Smoothen the relativePosition value by averaging with mRelativePosition (avoids sudden jerk when
- // user touche different points)
- float shortestDirection = ShortestDistanceInDomain(mRelativePosition.y, relativePosition.y, min.y, max.y);
- mRelativePosition.y += activate ? shortestDirection * ANIMATION_BLEND_COEFFICIENT : shortestDirection;
-
- // f represents this absolute distance. Get as a relative distance and inverse exponential
- // (as delay equation has an exponential effect i.e. the closer delayFactor to 1.0f,
- // the longer the delay would appear exponentially)
- float f = fabsf(mRelativePosition.y) * complete;
- f = std::min(f, 1.0f);
- f = 1.0f - powf(ANIMATION_BLEND_COEFFICIENT, f);
-
- // at center delay factor is mDelayMin, at maximum (1.0) it is mDelayMax
- f = Mix(mDelayMin, mDelayMax, f);
-
- // 2. Now that f (delay factor) has been determined for this Actor,
- // move mScrollPosition towards the actual scroll position, at rate determined by f.
- float shortest = ShortestDistanceInDomain(mScrollPosition.x, WrapInDomain(scrollPosition.x, -min.x, -max.x), min.x, max.x);
- mScrollPosition.x += activate ? shortest * (1.0f-f) : shortest;
- mScrollPosition.x = WrapInDomain(mScrollPosition.x, -min.x, -max.x);
- mScrollPosition.y = scrollPosition.y;
-
- Vector3 actorPosition(current + pagePosition + mScrollPosition);
-
- // Get position of actor.
- bool wrap = mScrollSlideInfo->mScrollWrap;
-
- if(wrap)
- {
- if(fabsf(min.x - max.x) > Math::MACHINE_EPSILON_1)
- {
- // WRAP X (based on the position of the right side)
- actorPosition.x = WrapInDomain(actorPosition.x + scrollSize.x, min.x, max.x) - scrollSize.width;
- }
- }
-
- const float targetRelativePositionX = (referencePoint.x + deltaPosition.x);
-
- float blend(Mix(1.0f, ANIMATION_BLEND_COEFFICIENT, 1.0f - (1.0f - complete) * (1.0f - complete) ));
- float invBlend(1.0f - blend);
-
- mRelativePosition.x = activate ? mRelativePosition.x * invBlend + targetRelativePositionX * blend : targetRelativePositionX;
- mRelativePosition.x = Chase( mRelativePosition.x, targetRelativePositionX, 1.0f );
-
- relativePosition.x = (actorPosition.x - mRelativePosition.x) / scrollSize.width;
-
- float difference = fabsf(ShortestDistanceInDomain(mScrollPosition.x, scrollPosition.x, -max.x, -min.x));
- mAverageSpeed = activate ? mAverageSpeed * invBlend + difference * blend : 0.0f;
-
- actorPosition.x += relativePosition.x * mAverageSpeed;
-
- return actorPosition - pagePosition;
- }
-
-private:
-
- ScrollSlideInfoPtr mScrollSlideInfo;
- Vector3 mScrollPosition; ///< The current scroll position
- float mDelayMin; ///< Minimum delay rate (at closest position to touch)
- float mDelayMax; ///< Maximum delay rate (at furthest position from touch - 1 page away)
- Vector2 mRelativePosition;
- float mAverageSpeed; ///< The Average speed of the Actor (proportional to mScrollPosition - scrollPosition)
-
-};
-
-/**
- * ScrollSlideScaleConstraint
- *
- */
-struct ScrollSlideScaleConstraint
-{
- /**
- * Constraint constructor
- */
- ScrollSlideScaleConstraint()
- {
- }
-
- /**
- * @param[in] current The current position
- * @param[in] scrollPositionProperty The scroll-view's position property (SCROLL_POSITION_PROPERTY_NAME)
- * @param[in] effectReferenceProperty The point in the scroll-view where the user touched the screen
- * @param[in] effectTimeProperty The current timer. Starting from 0.0 when scroll animation/dragging
- * commences. Ensures that constraint is applied and processed every frame (to achieve the delay effect)
- * @param[in] sizeProperty The size of the ScrollView.
- * @return The new position of this Actor.
- */
- Vector3 operator()(const Vector3& current,
- const PropertyInput& snapProperty)
- {
- float scale = 1.0f + snapProperty.GetFloat() * 0.008f;
- return Vector3( current.x * scale, current.y * scale, current.z);
- }
-
-};
-
-/**
- * Applies the slide constraints to the child actor for overshoot effect.
- *
- * @param[in] scrollView The ScrollView containing the pages.
- * @param[in] child The child to be affected with the slide effect.
- * @param[in] angleSwing The maximum amount the child actor should
- * rotate in radians for each axis (X and Y) as the page is scrolled.
- * move for each axis (X and Y) as the page is scrolled.
- */
-void ApplyScrollSlideConstraints(ScrollSlideInfoPtr scrollSlideInfo,
- Toolkit::ScrollView scrollView,
- Actor child,
- float delayMin,
- float delayMax)
-{
- // Apply constraints to these actors //
- Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
- ParentSource(Actor::POSITION),
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollViewSlideEffect::EFFECT_TIME ) ),
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_DELTA_PROPERTY_NAME ) ),
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollViewSlideEffect::EFFECT_ACTIVE ) ),
- ScrollSlidePositionConstraint(scrollSlideInfo, delayMin, delayMax) );
- constraint.SetRemoveAction( Constraint::Discard );
- child.ApplyConstraint( constraint );
-
- constraint = Constraint::New<Vector3>( Actor::SCALE,
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollViewSlideEffect::EFFECT_ACTIVE ) ),
- ScrollSlideScaleConstraint() );
- constraint.SetRemoveAction( Constraint::Discard );
- child.ApplyConstraint( constraint );
-}
-
-} // unnamed namespace
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-
-ScrollViewSlideEffect::ScrollViewSlideEffect()
-: mScrollSlideInfo(new ScrollSlideInfo()),
- mPropertyTime(Property::INVALID_INDEX),
- mPropertyReference(Property::INVALID_INDEX),
- mPropertyActive(Property::INVALID_INDEX),
- mDelayReferenceOffset(Vector3::ZERO),
- mMaxDelayDuration(DEFAULT_MAX_DELAY_DURATION)
-{
-}
-
-ScrollViewSlideEffect::~ScrollViewSlideEffect()
-{
-}
-
-bool ScrollViewSlideEffect::GetSlideDirection() const
-{
- return mScrollSlideInfo->mVertical;
-}
-
-void ScrollViewSlideEffect::SetSlideDirection(bool vertical)
-{
- mScrollSlideInfo->mVertical = vertical;
-}
-
-const Vector3& ScrollViewSlideEffect::GetDelayReferenceOffset() const
-{
- return mDelayReferenceOffset;
-}
-
-void ScrollViewSlideEffect::SetDelayReferenceOffset(const Vector3& offset)
-{
- mDelayReferenceOffset = offset;
-}
-
-float ScrollViewSlideEffect::GetMaxDelayDuration() const
-{
- return mMaxDelayDuration;
-}
-
-void ScrollViewSlideEffect::SetMaxDelayDuration(float duration)
-{
- mMaxDelayDuration = duration;
-}
-
-void ScrollViewSlideEffect::ApplyToActor(Actor child,
- float delayMin,
- float delayMax)
-{
- ApplyScrollSlideConstraints( mScrollSlideInfo,
- GetScrollView(),
- child,
- delayMin,
- delayMax );
-}
-
-void ScrollViewSlideEffect::OnAttach(Toolkit::ScrollView& scrollView)
-{
- mScrollSlideInfo->mScrollPosition = scrollView.GetProperty<Vector3>( scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_PROPERTY_NAME ) );
- mScrollSlideInfo->mScrollSize = scrollView.GetProperty<Vector3>( Actor::SIZE );
- mScrollSlideInfo->mScrollPositionMin = scrollView.GetProperty<Vector3>( scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_MIN_PROPERTY_NAME ) );
- mScrollSlideInfo->mScrollPositionMax = scrollView.GetProperty<Vector3>( scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_MAX_PROPERTY_NAME ) );
- mScrollSlideInfo->mScrollWrap = scrollView.GetProperty<bool>( scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_WRAP_PROPERTY_NAME ) );
- mScrollSlideInfo->mVertical = false;
-
- // Create effect-time property if not already created.
- if(mPropertyTime == Property::INVALID_INDEX)
- {
- mPropertyTime = SafeRegisterProperty( scrollView, Toolkit::ScrollViewSlideEffect::EFFECT_TIME, 0.0f );
- mPropertyReference = SafeRegisterProperty( scrollView, Toolkit::ScrollViewSlideEffect::EFFECT_REFERENCE, Vector3::ZERO );
- mPropertyActive = SafeRegisterProperty( scrollView, Toolkit::ScrollViewSlideEffect::EFFECT_ACTIVE, 0.0f );
- }
-
- // Create constraint to update ScrollSlideInfo
- // Doesn't matter what this is applied to and on what property.
- // Just needs to update mScrollSlideInfo values as properties change.
- // The minor constraints (applied to the Actors) can use this mScrollSlideInfo.
- Constraint constraint = Constraint::New<float>( mPropertyTime,
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ),
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollViewSlideEffect::EFFECT_REFERENCE ) ),
- Source(scrollView, Actor::SIZE),
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_MIN_PROPERTY_NAME ) ),
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_MAX_PROPERTY_NAME ) ),
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_WRAP_PROPERTY_NAME ) ),
- ScrollSlideInfoUpdate(mScrollSlideInfo) );
- constraint.SetRemoveAction( Constraint::Discard );
- mInfoUpdateConstraint = scrollView.ApplyConstraint( constraint );
-
- // Connect to the scroll view signals
- scrollView.ScrollStartedSignal().Connect(this, &ScrollViewSlideEffect::OnScrollStart);
- scrollView.SnapStartedSignal().Connect(this, &ScrollViewSlideEffect::OnScrollSnapStarted);
- scrollView.TouchedSignal().Connect(this, &ScrollViewSlideEffect::OnScrollTouched);
-
- AttachActor(scrollView);
-}
-
-bool ScrollViewSlideEffect::OnScrollTouched(Actor actor, const TouchEvent& event)
-{
- // Ignore events with multiple-touch points
- if (event.GetPointCount() != 1)
- {
- return false;
- }
-
- if (event.GetPoint(0).state == TouchPoint::Down)
- {
- const TouchPoint& point = event.GetPoint(0);
- Vector3 touchPosition(point.local - Stage::GetCurrent().GetSize() * 0.5f);
-
- Vector3 scrollPosition = GetScrollView().GetCurrentScrollPosition();
- GetScrollView().SetProperty(mPropertyReference, scrollPosition + touchPosition + mDelayReferenceOffset);
- }
-
- return false;
-}
-
-void ScrollViewSlideEffect::OnDetach(Toolkit::ScrollView& scrollView)
-{
- scrollView.ScrollStartedSignal().Disconnect(this, &ScrollViewSlideEffect::OnScrollStart);
- scrollView.SnapStartedSignal().Disconnect(this, &ScrollViewSlideEffect::OnScrollSnapStarted);
- scrollView.TouchedSignal().Disconnect(this, &ScrollViewSlideEffect::OnScrollTouched);
- scrollView.RemoveConstraint( mInfoUpdateConstraint );
-
- if(mAnimation)
- {
- mAnimation.FinishedSignal().Disconnect(this, &ScrollViewSlideEffect::OnAnimationFinished);
- mAnimation.Clear();
- mAnimation.Reset();
- }
-
- if(mAnimationSnap)
- {
- mAnimationSnap.FinishedSignal().Disconnect(this, &ScrollViewSlideEffect::OnAnimationSnapFinished);
- mAnimationSnap.Clear();
- mAnimationSnap.Reset();
- }
-}
-
-void ScrollViewSlideEffect::AttachActor(Actor actor)
-{
-
-}
-
-void ScrollViewSlideEffect::DetachActor(Actor actor)
-{
- // TODO: remove the specific constraint defined in AttachActor (and possibly
- // unregister property) - neither functionality exists in Dali.
-}
-
-void ScrollViewSlideEffect::ContinueAnimation(float endTime)
-{
- // continue animating
- if(mAnimation)
- {
- mAnimation.FinishedSignal().Disconnect(this, &ScrollViewSlideEffect::OnAnimationFinished);
- mAnimation.Clear();
- }
-
- Actor scrollView = GetScrollView();
-
- mAnimation = Animation::New(SLIDEEFFECT_ANIMATION_MAX_TIME);
- mAnimation.AnimateTo( Property(scrollView, mPropertyTime), endTime, AlphaFunctions::Linear );
- mAnimation.FinishedSignal().Connect(this, &ScrollViewSlideEffect::OnAnimationFinished);
- mAnimation.Play();
-}
-
-void ScrollViewSlideEffect::OnScrollStart( const Vector3& position )
-{
- Actor scrollView = GetScrollView();
- GetScrollView().SetProperty(mPropertyTime, 0.0f);
-
- ContinueAnimation(SLIDEEFFECT_ANIMATION_MAX_TIME);
-
- if(mAnimationSnap)
- {
- mAnimationSnap.FinishedSignal().Disconnect(this, &ScrollViewSlideEffect::OnAnimationSnapFinished);
- mAnimationSnap.Clear();
- }
-
- mAnimationSnap = Animation::New( EFFECT_SNAP_GROW_DURATION );
- mAnimationSnap.AnimateTo( Property(scrollView, mPropertyActive), 1.0f, AlphaFunctions::Linear );
- mAnimationSnap.FinishedSignal().Connect(this, &ScrollViewSlideEffect::OnAnimationSnapFinished);
- mAnimationSnap.Play();
-}
-
-void ScrollViewSlideEffect::OnScrollSnapStarted(const Toolkit::ScrollView::SnapEvent& event)
-{
- if(mAnimationSnap)
- {
- mAnimationSnap.Clear();
- }
-
- Actor scrollView = GetScrollView();
- mAnimationSnap = Animation::New(EFFECT_SNAP_DECAY_DURATION );
- mAnimationSnap.AnimateTo( Property(scrollView, mPropertyActive), 0.0f, AlphaFunctions::Linear );
- mAnimationSnap.FinishedSignal().Connect(this, &ScrollViewSlideEffect::OnAnimationSnapFinished);
- mAnimationSnap.Play();
-}
-
-void ScrollViewSlideEffect::OnAnimationSnapFinished( Animation& animation )
-{
- mAnimationSnap.FinishedSignal().Disconnect(this, &ScrollViewSlideEffect::OnAnimationSnapFinished);
- mAnimationSnap.Clear();
-
- // stop time animation
- if(mAnimation)
- {
- mAnimation.FinishedSignal().Disconnect(this, &ScrollViewSlideEffect::OnAnimationFinished);
- mAnimation.Clear();
- }
-}
-
-void ScrollViewSlideEffect::OnAnimationFinished( Animation& animation )
-{
- // still unstable, so continue animating.
- // TODO: Requires an instability check to ensure time animation finishes when delay is
- // less noticeable. i.e. all present scrollPositions are approx the same as mScrollPosition in constraints.
- // best solution for this is to switch to a single history vector of scroll position, and compare if
- // position has not deviated >= 0.5 pixel for the past 1 second.
- float endTime = GetScrollView().GetProperty<float>(mPropertyTime) + SLIDEEFFECT_ANIMATION_MAX_TIME;
- ContinueAnimation(endTime);
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
+++ /dev/null
-#ifndef __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_SLIDE_EFFECT_H__
-#define __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_SLIDE_EFFECT_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/animation/animation.h>
-#include <dali/public-api/animation/alpha-functions.h>
-#include <dali/public-api/animation/time-period.h>
-#include <dali/public-api/object/ref-object.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.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-slide-effect.h>
-#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
-
-namespace Dali
-{
-
-class Animation;
-
-namespace Toolkit
-{
-
-class ScrollView;
-
-namespace Internal
-{
-
-class ScrollSlideInfo;
-
-typedef IntrusivePtr<ScrollSlideInfo> ScrollSlideInfoPtr;
-
-/**
- * @copydoc Toolkit::ScrollViewSlideEffect
- */
-class ScrollViewSlideEffect : public ScrollViewEffect
-{
-public:
-
- /**
- * Constructor
- */
- ScrollViewSlideEffect();
-
-public:
-
- /**
- * @copydoc ScrollViewEffect::GetSlideDirection
- */
- bool GetSlideDirection() const;
-
- /**
- * @copydoc ScrollViewEffect::SetSlideDirection
- */
- void SetSlideDirection(bool vertical);
-
- /**
- * @copydoc ScrollViewEffect::GetDelayReferenceOffset
- */
- const Vector3& GetDelayReferenceOffset() const;
-
- /**
- * @copydoc ScrollViewEffect::SetDelayReferenceOffset
- */
- void SetDelayReferenceOffset(const Vector3& offset);
-
- /**
- * @copydoc ScrollViewEffect::GetMaxDelayDuration
- */
- float GetMaxDelayDuration() const;
-
- /**
- * @copydoc ScrollViewEffect::SetMaxDelayDuration
- */
- void SetMaxDelayDuration(float duration);
-
- /**
- * @copydoc ScrollViewEffect::ApplyToActor
- */
- void ApplyToActor( Actor child,
- float delayMin,
- float delayMax );
-public:
-
- /**
- * @copydoc ScrollViewEffect::OnAttach
- */
- virtual void OnAttach(Toolkit::ScrollView& scrollView);
-
- /**
- * @copydoc ScrollViewEffect::OnDetach
- */
- virtual void OnDetach(Toolkit::ScrollView& scrollView);
-
-protected:
-
- /**
- * A reference counted object may only be deleted by calling Unreference()
- */
- virtual ~ScrollViewSlideEffect();
-
-private:
-
- /**
- * Invoked when user touches the scroll-view
- * We keep track of the touch as this is used to determine
- * the reference point which is used to determine the delay
- * factor for the Actors' movements.
- * @param[in] actor The actor touched
- * @param[in] event The touch Event
- * @return Whether to consume the even or not.
- */
- bool OnScrollTouched(Actor actor, const TouchEvent& event);
-
- /**
- * Signal handler, called when the ScrollView starts to move
- *
- * @param[in] position The current scroll position
- */
- void OnScrollStart( const Vector3& position );
-
- /**
- * Signal handler, called when the ScrollView starts to snap
- * @param[in] event The snap event.
- */
- void OnScrollSnapStarted(const Toolkit::ScrollView::SnapEvent& event);
-
- /**
- * Signal handler, called some time after the ScrollView has completed
- * movement. There is a delay as when the ScrollView has completed
- * movement, there are Actors that have a delay, and take time to arrive
- * at their final destination.
- *
- * @param[in] animation The animation delegate for this delay
- */
- void OnAnimationSnapFinished( Animation& animation );
-
- /**
- * Signal handler, called when the Wobble Effect animation has completed.
- *
- * @param[in] animation The animation.
- */
- void OnAnimationFinished( Animation& animation );
-
- /**
- * Attaches effect to Scroll Actor (ScrollView)
- *
- * Applies the same wobble effect to each Scroll Actor.
- *
- * @param[in] actor The attached Actor
- */
- void AttachActor(Actor actor);
-
- /**
- * Detaches effect from Scroll Actor (ScrollView)
- *
- * @param[in] actor The attached Actor
- */
- void DetachActor(Actor actor);
-
- /**
- * Continues Animation to time reaches endTime
- *
- * @param[in] endTime the target time to reach.
- */
- void ContinueAnimation(float endTime);
-
-private:
-
- ScrollSlideInfoPtr mScrollSlideInfo; ///< Info structure to keep track of common properties amongst many constraints.
- ActiveConstraint mInfoUpdateConstraint; ///< Constraint applied to scroll-view to update Info structure.
- Animation mAnimation; ///< Animation Timer to drive the slide effect constraint.
- Animation mAnimationSnap; ///< Animation Snap (this animates from from 1.0 to 0.0 when contents snap)
- Property::Index mPropertyTime; ///< Time property used by slide effect constraint to calculate timePassed.
- Property::Index mPropertyReference; ///< Reference point in scroll-contents, this point has no delay.
- ///< The further out from this point, the further the delay.
- Property::Index mPropertyActive; ///< Property indicates the progress of the scrolling from 1.0f (scrolling) to 0.0f (fully snapped)
- Vector3 mDelayReferenceOffset; ///< Where to offset the delay reference point when dragging.
- float mMaxDelayDuration; ///< Maximum duration of effect after scroll-view completes.
-};
-
-} // namespace Internal
-
-// Helpers for public-api forwarding methods
-
-inline Internal::ScrollViewSlideEffect& GetImpl(Dali::Toolkit::ScrollViewSlideEffect& obj)
-{
- DALI_ASSERT_ALWAYS(obj);
-
- Dali::RefObject& handle = obj.GetBaseObject();
-
- return static_cast<Internal::ScrollViewSlideEffect&>(handle);
-}
-
-inline const Internal::ScrollViewSlideEffect& GetImpl(const Dali::Toolkit::ScrollViewSlideEffect& obj)
-{
- DALI_ASSERT_ALWAYS(obj);
-
- const Dali::RefObject& handle = obj.GetBaseObject();
-
- return static_cast<const Internal::ScrollViewSlideEffect&>(handle);
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_SLIDE_EFFECT_H__
return mOvershootAnimationSpeed;
};
-Toolkit::Scrollable::ScrollStartedSignalV2& Scrollable::ScrollStartedSignal()
+Toolkit::Scrollable::ScrollStartedSignalType& Scrollable::ScrollStartedSignal()
{
- return mScrollStartedSignalV2;
+ return mScrollStartedSignal;
}
-Toolkit::Scrollable::ScrollUpdatedSignalV2& Scrollable::ScrollUpdatedSignal()
+Toolkit::Scrollable::ScrollUpdatedSignalType& Scrollable::ScrollUpdatedSignal()
{
- return mScrollUpdatedSignalV2;
+ return mScrollUpdatedSignal;
}
-Toolkit::Scrollable::ScrollCompletedSignalV2& Scrollable::ScrollCompletedSignal()
+Toolkit::Scrollable::ScrollCompletedSignalType& Scrollable::ScrollCompletedSignal()
{
- return mScrollCompletedSignalV2;
+ return mScrollCompletedSignal;
}
-Toolkit::Scrollable::ScrollClampedSignalV2& Scrollable::ScrollClampedSignal()
+Toolkit::Scrollable::ScrollClampedSignalType& Scrollable::ScrollClampedSignal()
{
- return mScrollClampedSignalV2;
+ return mScrollClampedSignal;
}
bool Scrollable::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
/**
* @copydoc Dali::Toolkit::Scrollable::ScrollStartedSignal()
*/
- Toolkit::Scrollable::ScrollStartedSignalV2& ScrollStartedSignal();
+ Toolkit::Scrollable::ScrollStartedSignalType& ScrollStartedSignal();
/**
* @copydoc Dali::Toolkit::Scrollable::ScrollUpdatedSignal()
*/
- Toolkit::Scrollable::ScrollUpdatedSignalV2& ScrollUpdatedSignal();
+ Toolkit::Scrollable::ScrollUpdatedSignalType& ScrollUpdatedSignal();
/**
* @copydoc Dali::Toolkit::Scrollable::ScrollCompletedSignal()
*/
- Toolkit::Scrollable::ScrollCompletedSignalV2& ScrollCompletedSignal();
+ Toolkit::Scrollable::ScrollCompletedSignalType& ScrollCompletedSignal();
/**
* @copydoc Dali::Toolkit::Scrollable::ScrollClampedSignal()
*/
- Toolkit::Scrollable::ScrollClampedSignalV2& ScrollClampedSignal();
+ Toolkit::Scrollable::ScrollClampedSignalType& ScrollClampedSignal();
/**
* Connects a callback function with the object's signals.
std::map<Toolkit::Scrollable::ScrollComponentType, ScrollComponentPtr> mComponent; ///< ScrollComponent (such as a scrollbar/page indicator/status)
- Toolkit::Scrollable::ScrollStartedSignalV2 mScrollStartedSignalV2;
- Toolkit::Scrollable::ScrollUpdatedSignalV2 mScrollUpdatedSignalV2;
- Toolkit::Scrollable::ScrollCompletedSignalV2 mScrollCompletedSignalV2;
- Toolkit::Scrollable::ScrollClampedSignalV2 mScrollClampedSignalV2;
+ Toolkit::Scrollable::ScrollStartedSignalType mScrollStartedSignal;
+ Toolkit::Scrollable::ScrollUpdatedSignalType mScrollUpdatedSignal;
+ Toolkit::Scrollable::ScrollCompletedSignalType mScrollCompletedSignal;
+ Toolkit::Scrollable::ScrollClampedSignalType mScrollClampedSignal;
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()
$(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-custom-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-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-slide-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-controls/text-label-impl.cpp \
}
// Send notification for the change of focus actor
- mFocusChangedSignalV2.Emit( GetCurrentFocusActor(), actor );
+ mFocusChangedSignal.Emit( GetCurrentFocusActor(), actor );
// Save the current focused actor
mCurrentFocusActor = FocusIDPair(GetFocusOrder(actor), actorID);
}
// Send notification for the activation of focused actor
- mFocusedActorActivatedSignalV2.Emit(actor);
+ mFocusedActorActivatedSignal.Emit(actor);
}
}
mCurrentFocusActor = FocusIDPair(0, 0);
// Send notification for the change of focus actor
- mFocusChangedSignalV2.Emit(actor, Actor());
+ mFocusChangedSignal.Emit(actor, Actor());
if(mIsAccessibilityTtsEnabled)
{
{
DALI_LOG_INFO( gLogFilter, Debug::General, "[%s:%d] Overshot\n", __FUNCTION__, __LINE__);
// Send notification for handling overshooted situation
- mFocusOvershotSignalV2.Emit(GetCurrentFocusActor(), forward ? Toolkit::FocusManager::OVERSHOT_NEXT : Toolkit::FocusManager::OVERSHOT_PREVIOUS);
+ mFocusOvershotSignal.Emit(GetCurrentFocusActor(), forward ? Toolkit::FocusManager::OVERSHOT_NEXT : Toolkit::FocusManager::OVERSHOT_PREVIOUS);
return false; // Try to move the focus out of the scope
}
return handled;
}
-Toolkit::FocusManager::FocusChangedSignalV2& FocusManager::FocusChangedSignal()
+Toolkit::FocusManager::FocusChangedSignalType& FocusManager::FocusChangedSignal()
{
- return mFocusChangedSignalV2;
+ return mFocusChangedSignal;
}
-Toolkit::FocusManager::FocusOvershotSignalV2& FocusManager::FocusOvershotSignal()
+Toolkit::FocusManager::FocusOvershotSignalType& FocusManager::FocusOvershotSignal()
{
- return mFocusOvershotSignalV2;
+ return mFocusOvershotSignal;
}
-Toolkit::FocusManager::FocusedActorActivatedSignalV2& FocusManager::FocusedActorActivatedSignal()
+Toolkit::FocusManager::FocusedActorActivatedSignalType& FocusManager::FocusedActorActivatedSignal()
{
- return mFocusedActorActivatedSignalV2;
+ return mFocusedActorActivatedSignal;
}
bool FocusManager::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
/**
* @copydoc Toolkit::FocusManager::FocusChangedSignal()
*/
- Toolkit::FocusManager::FocusChangedSignalV2& FocusChangedSignal();
+ Toolkit::FocusManager::FocusChangedSignalType& FocusChangedSignal();
/**
* @copydoc Toolkit::FocusManager::FocusOvershotSignal()
*/
- Toolkit::FocusManager::FocusOvershotSignalV2& FocusOvershotSignal();
+ Toolkit::FocusManager::FocusOvershotSignalType& FocusOvershotSignal();
/**
* @copydoc Toolkit::FocusManager::FocusedActorActivatedSignal()
*/
- Toolkit::FocusManager::FocusedActorActivatedSignalV2& FocusedActorActivatedSignal();
+ Toolkit::FocusManager::FocusedActorActivatedSignalType& FocusedActorActivatedSignal();
/**
* Connects a callback function with the object's signals.
private:
- Toolkit::FocusManager::FocusChangedSignalV2 mFocusChangedSignalV2; ///< The signal to notify the focus change
- Toolkit::FocusManager::FocusOvershotSignalV2 mFocusOvershotSignalV2; ///< The signal to notify the focus overshooted
- Toolkit::FocusManager::FocusedActorActivatedSignalV2 mFocusedActorActivatedSignalV2; ///< The signal to notify the activation of focused actor
+ Toolkit::FocusManager::FocusChangedSignalType mFocusChangedSignal; ///< The signal to notify the focus change
+ Toolkit::FocusManager::FocusOvershotSignalType mFocusOvershotSignal; ///< The signal to notify the focus overshooted
+ Toolkit::FocusManager::FocusedActorActivatedSignalType mFocusedActorActivatedSignal; ///< The signal to notify the activation of focused actor
bool mIsWrapped; ///< Whether the focus movement is wrapped around or not
bool mIsFocusWithinGroup; ///< Whether the focus movement is limited to the current focus group or not
}
// Send notification for the change of focus actor
- if( !mFocusChangedSignalV2.Empty() )
+ if( !mFocusChangedSignal.Empty() )
{
- mFocusChangedSignalV2.Emit(GetCurrentFocusActor(), actor);
+ mFocusChangedSignal.Emit(GetCurrentFocusActor(), actor);
}
DALI_LOG_INFO( gLogFilter, Debug::General, "[%s:%d] Focus Changed\n", __FUNCTION__, __LINE__);
parentLayoutControl = GetParentLayoutControl(parentLayoutControl);
}
- if(!succeed && !mPreFocusChangeSignalV2.Empty())
+ if(!succeed && !mPreFocusChangeSignal.Empty())
{
// Don't know how to move the focus further. The application needs to tell us which actor to move the focus to
mIsWaitingKeyboardFocusChangeCommit = true;
- Actor nextFocusableActor = mPreFocusChangeSignalV2.Emit(currentFocusActor, Actor(), direction);
+ Actor nextFocusableActor = mPreFocusChangeSignal.Emit(currentFocusActor, Actor(), direction);
mIsWaitingKeyboardFocusChangeCommit = false;
if ( nextFocusableActor && nextFocusableActor.IsKeyboardFocusable() )
// We will try to move the focus to the actor. Emit a signal to notify the proposed actor to focus
// Signal handler can check the proposed actor and return a different actor if it wishes.
- if( !mPreFocusChangeSignalV2.Empty() )
+ if( !mPreFocusChangeSignal.Empty() )
{
mIsWaitingKeyboardFocusChangeCommit = true;
- committedFocusActor = mPreFocusChangeSignalV2.Emit(currentFocusActor, nextFocusableActor, direction);
+ committedFocusActor = mPreFocusChangeSignal.Emit(currentFocusActor, nextFocusableActor, direction);
mIsWaitingKeyboardFocusChangeCommit = false;
}
parentLayoutControl = GetParentLayoutControl(parentLayoutControl);
}
- if(!mFocusGroupChangedSignalV2.Empty())
+ if(!mFocusGroupChangedSignal.Empty())
{
// Emit a focus group changed signal. The applicaton can move the focus to a new focus group
- mFocusGroupChangedSignalV2.Emit(GetCurrentFocusActor(), forward);
+ mFocusGroupChangedSignal.Emit(GetCurrentFocusActor(), forward);
}
return succeed;
}
// Send notification for the activation of focused actor
- if( !mFocusedActorActivatedSignalV2.Empty() )
+ if( !mFocusedActorActivatedSignal.Empty() )
{
- mFocusedActorActivatedSignalV2.Emit(actor);
+ mFocusedActorActivatedSignal.Emit(actor);
}
}
}
}
// Send notification for the change of focus actor
- if( !mFocusChangedSignalV2.Empty() )
+ if( !mFocusChangedSignal.Empty() )
{
- mFocusChangedSignalV2.Emit(actor, Actor());
+ mFocusChangedSignal.Emit(actor, Actor());
}
}
ClearFocus();
}
-Toolkit::KeyboardFocusManager::PreFocusChangeSignalV2& KeyboardFocusManager::PreFocusChangeSignal()
+Toolkit::KeyboardFocusManager::PreFocusChangeSignalType& KeyboardFocusManager::PreFocusChangeSignal()
{
- return mPreFocusChangeSignalV2;
+ return mPreFocusChangeSignal;
}
-Toolkit::KeyboardFocusManager::FocusChangedSignalV2& KeyboardFocusManager::FocusChangedSignal()
+Toolkit::KeyboardFocusManager::FocusChangedSignalType& KeyboardFocusManager::FocusChangedSignal()
{
- return mFocusChangedSignalV2;
+ return mFocusChangedSignal;
}
-Toolkit::KeyboardFocusManager::FocusGroupChangedSignalV2& KeyboardFocusManager::FocusGroupChangedSignal()
+Toolkit::KeyboardFocusManager::FocusGroupChangedSignalType& KeyboardFocusManager::FocusGroupChangedSignal()
{
- return mFocusGroupChangedSignalV2;
+ return mFocusGroupChangedSignal;
}
-Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalV2& KeyboardFocusManager::FocusedActorActivatedSignal()
+Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalType& KeyboardFocusManager::FocusedActorActivatedSignal()
{
- return mFocusedActorActivatedSignalV2;
+ return mFocusedActorActivatedSignal;
}
bool KeyboardFocusManager::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
/**
* @copydoc Toolkit::KeyboardFocusManager::PreFocusChangeSignal()
*/
- Toolkit::KeyboardFocusManager::PreFocusChangeSignalV2& PreFocusChangeSignal();
+ Toolkit::KeyboardFocusManager::PreFocusChangeSignalType& PreFocusChangeSignal();
/**
* @copydoc Toolkit::KeyboardFocusManager::FocusChangedSignal()
*/
- Toolkit::KeyboardFocusManager::FocusChangedSignalV2& FocusChangedSignal();
+ Toolkit::KeyboardFocusManager::FocusChangedSignalType& FocusChangedSignal();
/**
* @copydoc Toolkit::KeyboardFocusManager::FocusGroupChangedSignal()
*/
- Toolkit::KeyboardFocusManager::FocusGroupChangedSignalV2& FocusGroupChangedSignal();
+ Toolkit::KeyboardFocusManager::FocusGroupChangedSignalType& FocusGroupChangedSignal();
/**
* @copydoc Toolkit::KeyboardFocusManager::FocusedActorActivatedSignal()
*/
- Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalV2& FocusedActorActivatedSignal();
+ Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalType& FocusedActorActivatedSignal();
/**
* Connects a callback function with the object's signals.
private:
- Toolkit::KeyboardFocusManager::PreFocusChangeSignalV2 mPreFocusChangeSignalV2; ///< The signal to notify the focus will be changed
- Toolkit::KeyboardFocusManager::FocusChangedSignalV2 mFocusChangedSignalV2; ///< The signal to notify the focus change
- Toolkit::KeyboardFocusManager::FocusGroupChangedSignalV2 mFocusGroupChangedSignalV2; ///< The signal to notify the focus group change
- Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalV2 mFocusedActorActivatedSignalV2; ///< The signal to notify the activation of focused actor
+ Toolkit::KeyboardFocusManager::PreFocusChangeSignalType mPreFocusChangeSignal; ///< The signal to notify the focus will be changed
+ Toolkit::KeyboardFocusManager::FocusChangedSignalType mFocusChangedSignal; ///< The signal to notify the focus change
+ Toolkit::KeyboardFocusManager::FocusGroupChangedSignalType mFocusGroupChangedSignal; ///< The signal to notify the focus group change
+ Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalType mFocusedActorActivatedSignal; ///< The signal to notify the activation of focused actor
unsigned int mCurrentFocusActor; ///< The actor ID of current focused actor
control.GetImplementation().OnKeyInputFocusGained();
// Emit the signal to inform focus change to the application.
- if ( !mKeyInputFocusChangedSignalV2.Empty() )
+ if ( !mKeyInputFocusChangedSignal.Empty() )
{
- mKeyInputFocusChangedSignalV2.Emit( control, previousFocusControl );
+ mKeyInputFocusChangedSignal.Emit( control, previousFocusControl );
}
}
return result;
}
-Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalV2& KeyInputFocusManager::KeyInputFocusChangedSignal()
+Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalType& KeyInputFocusManager::KeyInputFocusChangedSignal()
{
- return mKeyInputFocusChangedSignalV2;
+ return mKeyInputFocusChangedSignal;
}
-Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalV2& KeyInputFocusManager::UnhandledKeyEventSignal()
+Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalType& KeyInputFocusManager::UnhandledKeyEventSignal()
{
- return mUnhandledKeyEventSignalV2;
+ return mUnhandledKeyEventSignal;
}
KeyInputFocusManager::FocusStackIterator KeyInputFocusManager::FindFocusControlInStack( Toolkit::Control control ) const
if( !consumed )
{
// Emit signal to inform that a key event is not consumed.
- if( !mUnhandledKeyEventSignalV2.Empty() )
+ if( !mUnhandledKeyEventSignal.Empty() )
{
- mUnhandledKeyEventSignalV2.Emit(event);
+ mUnhandledKeyEventSignal.Emit(event);
}
}
}
/**
* @copydoc Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignal()
*/
- Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalV2& KeyInputFocusChangedSignal();
+ Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalType& KeyInputFocusChangedSignal();
/**
* @copydoc Toolkit::KeyInputFocusManager::UnhandledKeyEventSignal()
*/
- Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalV2& UnhandledKeyEventSignal();
+ Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalType& UnhandledKeyEventSignal();
/**
* Connects a callback function with the object's signals.
private:
// The key input focus change signal
- Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalV2 mKeyInputFocusChangedSignalV2;
+ Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalType mKeyInputFocusChangedSignal;
// The un-handled key event signal
- Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalV2 mUnhandledKeyEventSignalV2;
+ Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalType mUnhandledKeyEventSignal;
// Keyboard events are sent to the current focus actor, which will be the actor on the top of the focus actors stack.
FocusStack mFocusStack;
return GetImpl(*this).GetPath( name );
}
-Builder::Signal& Builder::QuitSignal()
+Builder::BuilderSignalType& Builder::QuitSignal()
{
return GetImpl( *this ).QuitSignal();
}
/**
* @brief Builder signal type
*/
- typedef SignalV2< void () > Signal;
+ typedef Signal< void () > BuilderSignalType;
/**
* @brief Signal emitted when a quit action is requested by the builder.
*/
- Signal& QuitSignal();
+ BuilderSignalType& QuitSignal();
private:
explicit DALI_INTERNAL Builder(Internal::Builder *impl);
/**
* @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 );
{
const char* const Button::SIGNAL_CLICKED = "clicked";
-const char* const Button::SIGNAL_TOGGLED = "toggled";
+const char* const Button::SIGNAL_STATE_CHANGED = "state-changed";
Button::Button()
{}
return Control::DownCast<Button, Internal::Button>(handle);
}
-void Button::SetDimmed( bool dimmed )
+void Button::SetDisabled( bool disabled )
{
- Dali::Toolkit::GetImplementation( *this ).SetDimmed( dimmed );
+ Dali::Toolkit::GetImplementation( *this ).SetDisabled( disabled );
}
-bool Button::IsDimmed() const
+bool Button::IsDisabled() const
{
- return Dali::Toolkit::GetImplementation( *this ).IsDimmed();
+ return Dali::Toolkit::GetImplementation( *this ).IsDisabled();
}
void Button::SetAnimationTime( float animationTime )
return Dali::Toolkit::GetImplementation( *this ).GetAnimationTime();
}
-Button::ClickedSignalV2& Button::ClickedSignal()
+Button::ClickedSignalType& Button::ClickedSignal()
{
return Dali::Toolkit::GetImplementation( *this ).ClickedSignal();
}
-Button::ToggledSignalV2& Button::ToggledSignal()
+Button::StateChangedSignalType& Button::StateChangedSignal()
{
- return Dali::Toolkit::GetImplementation( *this ).ToggledSignal();
+ return Dali::Toolkit::GetImplementation( *this ).StateChangedSignal();
}
Button::Button( Internal::Button& implementation )
/**
* @brief Button is a base class for different kind of buttons.
*
- * This class provides the dimmed property and the clicked signal.
+ * This class provides the disabled property and the clicked signal.
*
* A ClickedSignal() is emitted when the button is touched and the touch
* point doesn't leave the boundary of the button.
*
- * When the \e dimmed property is set to \e true, no signal is emitted.
+ * When the \e disabled property is set to \e true, no signal is emitted.
*/
class DALI_IMPORT_API Button : public Control
{
public:
// Signal Names
- static const char* const SIGNAL_CLICKED; ///< name "clicked"
- static const char* const SIGNAL_TOGGLED; ///< name "toggled"
+ static const char* const SIGNAL_CLICKED; ///< name "clicked"
+ static const char* const SIGNAL_STATE_CHANGED; ///< name "state-changed"
// Properties
- static const Property::Index PROPERTY_DIMMED; ///< name "dimmed", @see SetDimmed(), type BOOLEAN
+ static const Property::Index PROPERTY_DISABLED; ///< name "disabled", @see SetDisabled(), type BOOLEAN
+ static const Property::Index PROPERTY_AUTO_REPEATING; ///< name "auto-repeating", @see SetAutoRepeating(), type BOOLEAN
+ static const Property::Index PROPERTY_INITIAL_AUTO_REPEATING_DELAY; ///< name "initial-auto-repeating-delay", @see SetInitialAutoRepeatingDelay(), type FLOAT
+ static const Property::Index PROPERTY_NEXT_AUTO_REPEATING_DELAY; ///< name "next-auto-repeating-delay", @see SetNextAutoRepeatingDelay(), type FLOAT
+ static const Property::Index PROPERTY_TOGGLABLE; ///< name "togglable", @see SetToggleButton(), type BOOLEAN
+ static const Property::Index PROPERTY_TOGGLED; ///< name "toggled", @see SetToggled(), type BOOLEAN
+ static const Property::Index PROPERTY_NORMAL_STATE_ACTOR; ///< name "button-state-actor", @see SetButtonImage(), type MAP
+ static const Property::Index PROPERTY_SELECTED_STATE_ACTOR; ///< name "selected-state-actor", @see SetSelectedImage(), type MAP
+ static const Property::Index PROPERTY_DISABLED_STATE_ACTOR; ///< name "disabled-state-actor", @see SetDisabledImage(), type MAP
+ static const Property::Index PROPERTY_LABEL_ACTOR; ///< name "label-actor", @see SetLabel(), type MAP
public:
~Button();
/**
- * @brief Sets the button as \e dimmed.
+ * @brief Sets the button as \e disabled.
*
- * No signals are emitted when the \e dimmed property is set.
+ * No signals are emitted when the \e disabled property is set.
*
- * @param[in] dimmed property.
+ * @param[in] disabled property.
*/
- void SetDimmed( bool dimmed );
+ void SetDisabled( bool disabled );
/**
- * @return \e true if the button is \e dimmed.
+ * @return \e true if the button is \e disabled.
*/
- bool IsDimmed() const;
+ bool IsDisabled() const;
/**
* @brief Sets the animation time.
/**
* @brief Button Clicked signal type
*/
- typedef SignalV2< bool ( Button ) > ClickedSignalV2;
+ typedef Signal< bool ( Button ) > ClickedSignalType;
/**
- * @brief Button toggled signal type
+ * @brief Button state changed signal type
*/
- typedef SignalV2< bool ( Button, bool ) > ToggledSignalV2;
+ typedef Signal< bool ( Button, bool ) > StateChangedSignalType;
/**
* @brief Signal emitted when the button is touched and the touch point doesn't leave the boundary of the button.
*/
- ClickedSignalV2& ClickedSignal();
+ ClickedSignalType& ClickedSignal();
/**
- * @brief Signal emitted when the button's state is toggled.
+ * @brief Signal emitted when the button's state is changed.
*/
- ToggledSignalV2& ToggledSignal();
+ StateChangedSignalType& StateChangedSignal();
public: // Not intended for application developers
const char* const CheckBoxButton::ACTION_CHECK_BOX_BUTTON_CLICK = "check-box-button-click";
-const std::string CheckBoxButton::USE_FADE_ANIMATION_PROPERTY_NAME( "use-fade-animation" );
-const std::string CheckBoxButton::USE_CHECK_ANIMATION_PROPERTY_NAME( "use-check-animation" );
-
-
CheckBoxButton::CheckBoxButton()
: Button()
{
return Dali::Toolkit::GetImplementation( *this ).GetCheckedImage();
}
-void CheckBoxButton::SetDimmedBackgroundImage( Image image )
+void CheckBoxButton::SetDisabledBackgroundImage( Image image )
{
- Dali::Toolkit::GetImplementation( *this ).SetDimmedBackgroundImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( image );
}
-void CheckBoxButton::SetDimmedBackgroundImage( Actor image )
+void CheckBoxButton::SetDisabledBackgroundImage( Actor image )
{
- Dali::Toolkit::GetImplementation( *this ).SetDimmedBackgroundImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( image );
}
-Actor CheckBoxButton::GetDimmedBackgroundImage() const
+Actor CheckBoxButton::GetDisabledBackgroundImage() const
{
- return Dali::Toolkit::GetImplementation( *this ).GetDimmedBackgroundImage();
+ return Dali::Toolkit::GetImplementation( *this ).GetDisabledBackgroundImage();
}
-void CheckBoxButton::SetDimmedCheckedImage( Image image )
+void CheckBoxButton::SetDisabledCheckedImage( Image image )
{
- Dali::Toolkit::GetImplementation( *this ).SetDimmedCheckedImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetDisabledCheckedImage( image );
}
-void CheckBoxButton::SetDimmedCheckedImage( Actor image )
+void CheckBoxButton::SetDisabledCheckedImage( Actor image )
{
- Dali::Toolkit::GetImplementation( *this ).SetDimmedCheckedImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetDisabledCheckedImage( image );
}
-Actor CheckBoxButton::GetDimmedCheckedImage() const
+Actor CheckBoxButton::GetDisabledCheckedImage() const
{
- return Dali::Toolkit::GetImplementation( *this ).GetDimmedCheckedImage();
+ return Dali::Toolkit::GetImplementation( *this ).GetDisabledCheckedImage();
}
CheckBoxButton::CheckBoxButton( Internal::CheckBoxButton& implementation )
* By default a CheckBoxButton emits a Button::ClickedSignal() signal when the button changes its state to checked or unchecked.
*
* The button's appearance could be modified by setting images or actors with CheckBoxButton::SetBackgroundImage,
- * CheckBoxButton::SetCheckedImage, CheckBoxButton::SetDimmedBackgroundImage and CheckBoxButton::SetDimmedCheckedImage.
+ * CheckBoxButton::SetCheckedImage, CheckBoxButton::SetDisabledBackgroundImage and CheckBoxButton::SetDisabledCheckedImage.
*
- * When the button is not dimmed, if it's not checked it only shows the \e background image. The \e checked image is shown over the
+ * When the button is not disabled, if it's not checked it only shows the \e background image. The \e checked image is shown over the
* \e background image when the box is checked (\e background image is not replaced by \e checked image).
*
- * When the button is dimmed, \e background image and \e checked image are replaced by \e dimmed images.
+ * When the button is disabled, \e background image and \e checked image are replaced by \e disabled images.
*
* CheckBoxButton doesn't have a text. However, a Dali::Toolkit::TableView with a Dali::TextActor or a Dali::Toolkit::TextView
* and a CheckBoxButton could be used instead.
//Action Names
static const char* const ACTION_CHECK_BOX_BUTTON_CLICK;
- // Properties
- static const std::string USE_FADE_ANIMATION_PROPERTY_NAME;
- static const std::string USE_CHECK_ANIMATION_PROPERTY_NAME;
-
public:
/**
/**
* Sets the button as checked or unchecked.
*
- * Emits a Button::ClickedSignal() signal if the checkbox is not dimmed and the new state,
+ * Emits a Button::ClickedSignal() signal if the checkbox is not disabled and the new state,
* given in the \e checked param, is different than the previous one.
*
* @param[in] checked state.
Actor GetCheckedImage() const;
/**
- * Sets the dimmed background image.
+ * Sets the disabled background image.
*
- * @param[in] image The dimmed background image.
+ * @param[in] image The disabled background image.
*/
- void SetDimmedBackgroundImage( Image image );
+ void SetDisabledBackgroundImage( Image image );
/**
- * @copydoc SetDimmedBackgroundImage( Image image )
+ * @copydoc SetDisabledBackgroundImage( Image image )
*/
- void SetDimmedBackgroundImage( Actor image );
+ void SetDisabledBackgroundImage( Actor image );
/**
- * Gets the dimmed background image.
- * @return An actor with the dimmed background image.
+ * Gets the disabled background image.
+ * @return An actor with the disabled background image.
*/
- Actor GetDimmedBackgroundImage() const;
+ Actor GetDisabledBackgroundImage() const;
/**
- * Sets the dimmed checked image.
+ * Sets the disabled checked image.
*
- * @param[in] image The dimmed checked image.
+ * @param[in] image The disabled checked image.
*/
- void SetDimmedCheckedImage( Image image );
+ void SetDisabledCheckedImage( Image image );
/**
- * @copydoc SetDimmedCheckedImage( Image image )
+ * @copydoc SetDisabledCheckedImage( Image image )
*/
- void SetDimmedCheckedImage( Actor image );
+ void SetDisabledCheckedImage( Actor image );
/**
- * Gets the dimmed checked image.
- * @return An actor with the dimmed checked image.
+ * Gets the disabled checked image.
+ * @return An actor with the disabled checked image.
*/
- Actor GetDimmedCheckedImage() const;
+ Actor GetDisabledCheckedImage() const;
public: // Not intended for application developers
return Dali::Toolkit::GetImplementation( *this ).GetBackgroundImage();
}
-void PushButton::SetPressedImage( Image image )
+void PushButton::SetSelectedImage( Image image )
{
- Dali::Toolkit::GetImplementation( *this ).SetPressedImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( image );
}
-void PushButton::SetPressedImage( Actor image )
+void PushButton::SetSelectedImage( Actor image )
{
- Dali::Toolkit::GetImplementation( *this ).SetPressedImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( image );
}
-Actor PushButton::GetPressedImage() const
+Actor PushButton::GetSelectedImage() const
{
- return Dali::Toolkit::GetImplementation( *this ).GetPressedImage();
+ return Dali::Toolkit::GetImplementation( *this ).GetSelectedImage();
}
-void PushButton::SetDimmedBackgroundImage( Image image )
+void PushButton::SetDisabledBackgroundImage( Image image )
{
- Dali::Toolkit::GetImplementation( *this ).SetDimmedBackgroundImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( image );
}
-void PushButton::SetDimmedBackgroundImage( Actor image )
+void PushButton::SetDisabledBackgroundImage( Actor image )
{
- Dali::Toolkit::GetImplementation( *this ).SetDimmedBackgroundImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( image );
}
-Actor PushButton::GetDimmedBackgroundImage() const
+Actor PushButton::GetDisabledBackgroundImage() const
{
- return Dali::Toolkit::GetImplementation( *this ).GetDimmedBackgroundImage();
+ return Dali::Toolkit::GetImplementation( *this ).GetDisabledBackgroundImage();
}
-void PushButton::SetDimmedImage( Image image )
+void PushButton::SetDisabledImage( Image image )
{
- Dali::Toolkit::GetImplementation( *this ).SetDimmedImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( image );
}
-void PushButton::SetDimmedImage( Actor image )
+void PushButton::SetDisabledImage( Actor image )
{
- Dali::Toolkit::GetImplementation( *this ).SetDimmedImage( image );
+ Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( image );
}
-Actor PushButton::GetDimmedImage() const
+Actor PushButton::GetDisabledImage() const
{
- return Dali::Toolkit::GetImplementation( *this ).GetDimmedImage();
+ return Dali::Toolkit::GetImplementation( *this ).GetDisabledImage();
}
-void PushButton::SetLabelText( const std::string& text )
+void PushButton::SetLabel( const std::string& label )
{
- Dali::Toolkit::GetImplementation( *this ).SetLabelText( text );
+ Dali::Toolkit::GetImplementation( *this ).SetLabel( label );
}
-void PushButton::SetLabelText( Actor text )
+void PushButton::SetLabel( Actor label )
{
- Dali::Toolkit::GetImplementation( *this ).SetLabelText( text );
+ Dali::Toolkit::GetImplementation( *this ).SetLabel( label );
}
-Actor PushButton::GetLabelText() const
+Actor PushButton::GetLabel() const
{
- return Dali::Toolkit::GetImplementation( *this ).GetLabelText();
+ return Dali::Toolkit::GetImplementation( *this ).GetLabel();
}
-PushButton::PressedSignalV2& PushButton::PressedSignal()
+PushButton::PressedSignalType& PushButton::PressedSignal()
{
return Dali::Toolkit::GetImplementation( *this ).PressedSignal();
}
-PushButton::ReleasedSignalV2& PushButton::ReleasedSignal()
+PushButton::ReleasedSignalType& PushButton::ReleasedSignal()
{
return Dali::Toolkit::GetImplementation( *this ).ReleasedSignal();
}
*
* The intervals could be modified with the PushButton::SetInitialAutoRepeatingDelay and PushButton::SetNextAutoRepeatingDelay methods.
*
- * A \e toggle button can't be \e autorepeating. If the \e autorepeating property is set to \e true, then the \e toggle property is set to
+ * A \e toggle button can't be \e autorepeating. If the \e autorepeating property is set to \e true, then the \e toggled property is set to
* false but no signal is emitted.
*
* <li>\e toggle
*
- * When \e toggle is set to \e true, a PushButton::ToggledSignal() signal is emitted, with the toggle state, every time the button is touched instead
+ * When \e toggle is set to \e true, a Button::StateChangedSignal() signal is emitted, with the toggle state, every time the button is touched instead
* of emit PushButton::PressedSignal(), Button::ClickedSignal() and PushButton::ReleasedSignal() signals.
*
- * An \e autorepeating button can't be \e toggle. If the \e toggle property is set to \e true, then the \e autorepeating property is set to false.
+ * An \e autorepeating button can't be \e toggle. If the \e toggled property is set to \e true, then the \e autorepeating property is set to false.
* </ul>
*
* The button's appearance could be modified by setting images or actors with PushButton::SetButtonImage, PushButton::SetBackgroundImage,
- * PushButton::SetPressedImage, PushButton::SetDimmedBackgroundImage and PushButton::SetDimmedImage or setting a text with
- * PushButton::SetLabelText.
+ * PushButton::SetSelectedImage, PushButton::SetDisabledBackgroundImage and PushButton::SetDisabledImage or setting a text with
+ * PushButton::SetLabel.
*
* The \e background is always shown and doesn't change if the button is pressed or released. The \e button image is shown over the \e background image when the
- * button is not pressed and is replaced by the \e pressed image when the button is pressed. The text label is placed always on the top of all images.
+ * button is not pressed and is replaced by the \e selected image when the button is pressed. The text label is placed always on the top of all images.
*
- * When the button is dimmed, \e background, \e button and \e pressed images are replaced by their \e dimmed images.
+ * When the button is disabled, \e background, \e button and \e selected images are replaced by their \e disabled images.
*
* The methods used to modify the button's appearance could receive Dali::Actor objects as a parameter, so more complex images could be defined.
*
- * Is not mandatory set all images. A button could be defined only by setting its \e background image or by setting its \e background and \e pressed images.
+ * Is not mandatory set all images. A button could be defined only by setting its \e background image or by setting its \e background and \e selected images.
*/
class DALI_IMPORT_API PushButton : public Button
{
//Action Names
static const char* const ACTION_PUSH_BUTTON_CLICK; ///< name "push-button-click"
- // Properties
- static const Property::Index PROPERTY_AUTO_REPEATING; ///< name "auto-repeating", @see SetAutoRepeating(), type BOOLEAN
- static const Property::Index PROPERTY_INITIAL_AUTO_REPEATING_DELAY; ///< name "initial-auto-repeating-delay", @see SetInitialAutoRepeatingDelay(), type FLOAT
- static const Property::Index PROPERTY_NEXT_AUTO_REPEATING_DELAY; ///< name "next-auto-repeating-delay", @see SetNextAutoRepeatingDelay(), type FLOAT
- static const Property::Index PROPERTY_TOGGLABLE; ///< name "togglable", @see SetToggleButton(), type BOOLEAN
- static const Property::Index PROPERTY_TOGGLE; ///< name "toggle", @see SetToggled(), type BOOLEAN
- static const Property::Index PROPERTY_NORMAL_STATE_ACTOR; ///< name "button-state-actor", @see SetButtonImage(), type MAP
- static const Property::Index PROPERTY_PRESSED_STATE_ACTOR; ///< name "pressed-state-actor", @see SetPressedImage(), type MAP
- static const Property::Index PROPERTY_DIMMED_STATE_ACTOR; ///< name "dimmed-state-actor", @see SetDimmedImage(), type MAP
- static const Property::Index PROPERTY_LABEL_ACTOR; ///< name "label-actor", @see SetLabelText(), type STRING
-
public:
/**
/**
* @brief Sets the \e autorepeating property.
*
- * If the \e autorepeating property is set to \e true, then the \e toggle property is set to false
+ * If the \e autorepeating property is set to \e true, then the \e toggled property is set to false
* but no signal is emitted.
*
* @param[in] autoRepeating \e autorepeating property.
float GetNextAutoRepeatingDelay() const;
/**
- * @brief Sets the \e toggle property.
+ * @brief Sets the \e toggled property.
*
- * If the \e toggle property is set to \e true, then the \e autorepeating property is set to false.
+ * If the \e toggled property is set to \e true, then the \e autorepeating property is set to false.
*
* @param[in] toggle property.
*/
void SetToggleButton( bool toggle );
/**
- * @return \e true if the \e toggle property is set.
+ * @return \e true if the \e toggled property is set.
*/
bool IsToggleButton() const;
/**
* @brief Sets the button as toggled or not toggled.
*
- * \e toggle property must be set to \e true.
+ * \e toggled property must be set to \e true.
*
- * Emits a PushButton::ToggledSignal() signal.
+ * Emits a Button::StateChangedSignal() signal.
*
* @param[in] toggle state.
*/
void SetToggled( bool toggle );
/**
- * @return \e true if the \e toggle property is set and the button is toggled.
+ * @return \e true if the \e toggled property is set and the button is toggled.
*/
bool IsToggled() const;
Actor GetBackgroundImage() const;
/**
- * @brief Sets the pressed image.
+ * @brief Sets the selected image.
*
- * @param[in] image The pressed image.
+ * @param[in] image The selected image.
*/
- void SetPressedImage( Image image );
+ void SetSelectedImage( Image image );
/**
- * @copydoc SetPressedImage( Image image )
+ * @copydoc SetSelectedImage( Image image )
*/
- void SetPressedImage( Actor image );
+ void SetSelectedImage( Actor image );
/**
- * @brief Gets the pressed image.
+ * @brief Gets the selected image.
*
- * @return An actor with the pressed image.
+ * @return An actor with the selected image.
*/
- Actor GetPressedImage() const;
+ Actor GetSelectedImage() const;
/**
- * @brief Sets the dimmed background image.
+ * @brief Sets the disabled background image.
*
- * @param[in] image The dimmed background image.
+ * @param[in] image The disabled background image.
*/
- void SetDimmedBackgroundImage( Image image );
+ void SetDisabledBackgroundImage( Image image );
/**
- * @copydoc SetDimmedBackgroundImage( Image image )
+ * @copydoc SetDisabledBackgroundImage( Image image )
*/
- void SetDimmedBackgroundImage( Actor image );
+ void SetDisabledBackgroundImage( Actor image );
/**
- * @brief Gets the dimmed background image.
+ * @brief Gets the disabled background image.
*
- * @return An actor with the dimmed background image.
+ * @return An actor with the disabled background image.
*/
- Actor GetDimmedBackgroundImage() const;
+ Actor GetDisabledBackgroundImage() const;
/**
- * @brief Sets the dimmed button image.
+ * @brief Sets the disabled button image.
*
- * @param[in] image The dimmed button image.
+ * @param[in] image The disabled button image.
*/
- void SetDimmedImage( Image image );
+ void SetDisabledImage( Image image );
/**
- * @copydoc SetDimmedImage( Image image )
+ * @copydoc SetDisabledImage( Image image )
*/
- void SetDimmedImage( Actor image );
+ void SetDisabledImage( Actor image );
/**
- * @brief Gets the dimmed image.
+ * @brief Gets the disabled image.
*
- * @return An actor with the dimmed image.
+ * @return An actor with the disabled image.
*/
- Actor GetDimmedImage() const;
+ Actor GetDisabledImage() const;
/**
- * @brief Sets the text label.
+ * @brief Sets the button label.
*
- * @param[in] text Label text.
+ * @param[in] label The button label.
*/
- void SetLabelText( const std::string& text );
+ void SetLabel( const std::string& label );
/**
- * @copydoc SetLabelText( const std::string& text )
+ * @copydoc SetLabel( const std::string& label )
*/
- void SetLabelText( Actor text );
+ void SetLabel( Actor label );
/**
- * @brief Gets the label text.
+ * @brief Gets the label.
*
- * @return An actor with the label text.
+ * @return An actor with the label.
*/
- Actor GetLabelText() const;
+ Actor GetLabel() const;
public: //Signals
/// @brief PushButton Pressed signal type.
- typedef SignalV2< bool ( Button ) > PressedSignalV2;
+ typedef Signal< bool ( Button ) > PressedSignalType;
/// @brief PushButton Released signal type.
- typedef SignalV2< bool ( Button ) > ReleasedSignalV2;
+ typedef Signal< bool ( Button ) > ReleasedSignalType;
/**
* @brief Signal emitted when the button is touched.
*/
- PressedSignalV2& PressedSignal();
+ PressedSignalType& PressedSignal();
/**
* @brief Signal emitted when the button is touched and the touch point leaves the boundary of the button.
*/
- ReleasedSignalV2& ReleasedSignal();
+ ReleasedSignalType& ReleasedSignal();
public: // Not intended for application developers
return Dali::Toolkit::GetImplementation(*this).GetLabel();
}
-void RadioButton::SetActive(bool active)
+void RadioButton::SetSelected(bool selected)
{
- Dali::Toolkit::GetImplementation(*this).SetActive(active);
+ Dali::Toolkit::GetImplementation(*this).SetSelected(selected);
}
-bool RadioButton::IsActive()const
+bool RadioButton::IsSelected()const
{
- return Dali::Toolkit::GetImplementation(*this).IsActive();
+ return Dali::Toolkit::GetImplementation(*this).IsSelected();
}
void RadioButton::ToggleState()
}
/**
- * @brief A RadioButton provides a radio button which two states \e active or \e inactive.
+ * @brief A RadioButton provides a radio button which two states \e selected or \e unselected.
*
* Radio buttons are designed to select one of many option at the same time.
*
- * Every button have its own \e label and \e state, which can be modified by RadioButton::SetLabel and RadioButton::SetActive.
+ * Every button have its own \e label and \e state, which can be modified by RadioButton::SetLabel and RadioButton::SetSelected.
*
* RadioButton can change its current state using RadioButton::ToggleState.
*
* RadioButtons can be grouped.
* Two or more RadioButtons are in one group when they have this same parent.
- * In each groups only one RadioButton can be \e active at a given time.
- * So when RadioButton is set to \e active, other RadioButtons in its group are set to \e inactive.
- * When \e active RadioButton is set to \e inactive no other RadioButtons in his group is set to \e active.
+ * In each groups only one RadioButton can be \e selected at a given time.
+ * So when RadioButton is set to \e selected, other RadioButtons in its group are set to \e unselected.
+ * When \e selected RadioButton is set to \e unselected no other RadioButtons in his group is set to \e selected.
*
- * A Button::ClickedSignal() is emitted when the RadioButton change its state to \e active or \e inactive.
+ * A Button::ClickedSignal() is emitted when the RadioButton change its state to \e selected or \e unselected.
*/
class DALI_IMPORT_API RadioButton: public Button
{
public:
-
- // Properties
- static const Property::Index PROPERTY_ACTIVE; ///< name "active", @see SetActive(), type BOOLEAN
- static const Property::Index PROPERTY_LABEL_ACTOR; ///< name "label-actor", @see SetLabel(), type MAP
-
- public:
/**
* @brief Create an uninitialized RadioButton; this can be initialized with RadioButton::New().
*
Actor GetLabel() const;
/**
- * @brief Sets the button as active or inactive.
+ * @brief Sets the button as selected or unselected.
*
- * @param[in] active property
+ * @param[in] selected property
*/
- void SetActive(bool active);
+ void SetSelected(bool selected);
/**
- * @return true if button is active, false if button is inactive.
+ * @return true if button is selected, false if button is unselected.
*/
- bool IsActive()const;
+ bool IsSelected()const;
/**
* @brief Change button state.
*
- * If button is active deactivate it. If button is inactive activate it.
+ * If button is selected unselect it. If button is unselected select it.
*/
void ToggleState();
: mControlImpl( controlImpl ),
mBackground( NULL ),
mStartingPinchScale( NULL ),
- mKeyEventSignalV2(),
+ mKeyEventSignal(),
mPinchGestureDetector(),
mPanGestureDetector(),
mTapGestureDetector(),
Control& mControlImpl;
Background* mBackground; ///< Only create the background if we use it
Vector3* mStartingPinchScale; ///< The scale when a pinch gesture starts, TODO: consider removing this
- Toolkit::Control::KeyEventSignalV2 mKeyEventSignalV2;
+ Toolkit::Control::KeyEventSignalType mKeyEventSignal;
// Gesture Detection
PinchGestureDetector mPinchGestureDetector;
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)
return connected;
}
-Toolkit::Control::KeyEventSignalV2& Control::KeyEventSignal()
+Toolkit::Control::KeyEventSignalType& Control::KeyEventSignal()
{
- return mImpl->mKeyEventSignalV2;
+ return mImpl->mKeyEventSignal;
}
bool Control::EmitKeyEventSignal( const KeyEvent& event )
bool consumed = false;
// signals are allocated dynamically when someone connects
- if ( !mImpl->mKeyEventSignalV2.Empty() )
+ if ( !mImpl->mKeyEventSignal.Empty() )
{
- consumed = mImpl->mKeyEventSignalV2.Emit( handle, event );
+ consumed = mImpl->mKeyEventSignal.Emit( handle, event );
}
if (!consumed)
}
}
-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
/**
* @copydoc Dali::Toolkit::Control::KeyEventSignal()
*/
- Toolkit::Control::KeyEventSignalV2& KeyEventSignal();
+ Toolkit::Control::KeyEventSignalType& KeyEventSignal();
/**
* @brief Called by the KeyInputFocusManager to emit key event signals.
// 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
return GetImplementation().GetBackgroundActor();
}
-Control::KeyEventSignalV2& Control::KeyEventSignal()
+Control::KeyEventSignalType& Control::KeyEventSignal()
{
return GetImplementation().KeyEventSignal();
}
// Typedefs
/// @brief Key Event signal type;
- typedef SignalV2<bool ( Control, const KeyEvent& ) > KeyEventSignalV2;
+ typedef Signal<bool ( Control, const KeyEvent& ) > KeyEventSignalType;
public: // Creation & Destruction
* @pre The Control has been initialized.
* @return The signal to connect to.
*/
- KeyEventSignalV2& KeyEventSignal();
+ KeyEventSignalType& KeyEventSignal();
public: // Intended for control developers
} // namespace
-CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, const std::string& checkedImagePath, const std::string& dimmedBackgroundImagePath, const std::string& dimmedCheckedImagePath )
+CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, const std::string& checkedImagePath, const std::string& disabledBackgroundImagePath, const std::string& disabledCheckedImagePath )
{
CheckBoxButton button = Toolkit::CheckBoxButton::New();
button.SetCheckedImage( CreateAlignedImage( checkedImagePath ) );
}
- if( !dimmedBackgroundImagePath.empty() )
+ if( !disabledBackgroundImagePath.empty() )
{
- button.SetDimmedBackgroundImage( CreateAlignedImage( dimmedBackgroundImagePath ) );
+ button.SetDisabledBackgroundImage( CreateAlignedImage( disabledBackgroundImagePath ) );
}
- if( !dimmedCheckedImagePath.empty() )
+ if( !disabledCheckedImagePath.empty() )
{
- button.SetDimmedCheckedImage( CreateAlignedImage( dimmedCheckedImagePath ) );
+ button.SetDisabledCheckedImage( CreateAlignedImage( disabledCheckedImagePath ) );
}
return button;
}
-CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor checkedImageActor, Actor dimmedBackgroundImageActor, Actor dimmedCheckedImagActor )
+CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor checkedImageActor, Actor disabledBackgroundImageActor, Actor disabledCheckedImagActor )
{
CheckBoxButton button = Toolkit::CheckBoxButton::New();
button.SetCheckedImage( CreateAlignedImage( checkedImageActor ) );
}
- if( dimmedBackgroundImageActor )
+ if( disabledBackgroundImageActor )
{
- button.SetDimmedBackgroundImage( CreateAlignedImage( dimmedBackgroundImageActor ) );
+ button.SetDisabledBackgroundImage( CreateAlignedImage( disabledBackgroundImageActor ) );
}
- if( dimmedCheckedImagActor )
+ if( disabledCheckedImagActor )
{
- button.SetDimmedCheckedImage( CreateAlignedImage( dimmedCheckedImagActor ) );
+ button.SetDisabledCheckedImage( CreateAlignedImage( disabledCheckedImagActor ) );
}
return button;
*
* @param[in] backgroundImagePath Image path to be shown as button background.
* @param[in] checkedImagePath Image path to be shown as checked button.
- * @param[in] dimmedBackgroundImagePath Image path to be shown as button dimmed background.
- * @param[in] dimmedCheckedImagePath Image path to be shown as dimmed checked button.
+ * @param[in] disabledBackgroundImagePath Image path to be shown as button isabled background.
+ * @param[in] disabledCheckedImagePath Image path to be shown as disabled checked button.
*/
-DALI_IMPORT_API CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, const std::string& checkedImagePath, const std::string& dimmedBackgroundImagePath, const std::string& dimmedCheckedImagePath );
+DALI_IMPORT_API CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, const std::string& checkedImagePath, const std::string& disabledBackgroundImagePath, const std::string& disabledCheckedImagePath );
/**
* Creates a check box button with the given images.
*
* @param[in] backgroundImageActor Image to be shown as button background.
* @param[in] checkedImageActor Image to be shown as checked button.
- * @param[in] dimmedBackgroundImageActor Image to be shown as button dimmed background.
- * @param[in] dimmedCheckedImagActor Image to be shown as dimmed checked button.
+ * @param[in] disabledBackgroundImageActor Image to be shown as button disabled background.
+ * @param[in] disabledCheckedImagActor Image to be shown as disabled checked button.
*/
-DALI_IMPORT_API CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor checkedImageActor, Actor dimmedBackgroundImageActor, Actor dimmedCheckedImagActor );
+DALI_IMPORT_API CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor checkedImageActor, Actor disabledBackgroundImageActor, Actor disabledCheckedImagActor );
/**
* Creates a check box button with the given background and checked images.
} // namespace
-PushButton CreatePushButton( const std::string& releasedImagePath, const std::string& pressedImagePath, const std::string& backgroundImagePath,
- const std::string& dimmedReleasedImagePath, const std::string& dimmedBackgroundImagePath )
+PushButton CreatePushButton( const std::string& unselectedImagePath, const std::string& selectedImagePath, const std::string& backgroundImagePath,
+ const std::string& disabledUnselectedImagePath, const std::string& disabledBackgroundImagePath )
{
PushButton button = Toolkit::PushButton::New();
- if( !releasedImagePath.empty() )
+ if( !unselectedImagePath.empty() )
{
- button.SetButtonImage( CreateAlignedImage( releasedImagePath ) );
+ button.SetButtonImage( CreateAlignedImage( unselectedImagePath ) );
}
- if( !pressedImagePath.empty() )
+ if( !selectedImagePath.empty() )
{
- button.SetPressedImage( CreateAlignedImage( pressedImagePath ) );
+ button.SetSelectedImage( CreateAlignedImage( selectedImagePath ) );
}
if( !backgroundImagePath.empty() )
button.SetBackgroundImage( CreateAlignedImage( backgroundImagePath ) );
}
- if( !dimmedReleasedImagePath.empty() )
+ if( !disabledUnselectedImagePath.empty() )
{
- button.SetDimmedImage( CreateAlignedImage( dimmedReleasedImagePath ) );
+ button.SetDisabledImage( CreateAlignedImage( disabledUnselectedImagePath ) );
}
- if( !dimmedBackgroundImagePath.empty() )
+ if( !disabledBackgroundImagePath.empty() )
{
- button.SetDimmedBackgroundImage( CreateAlignedImage( dimmedBackgroundImagePath ) );
+ button.SetDisabledBackgroundImage( CreateAlignedImage( disabledBackgroundImagePath ) );
}
return button;
}
-PushButton CreatePushButton( Actor releasedImageActor, Actor pressedImageActor, Actor backgroundImageActor,
- Actor dimmedReleasedImageActor, Actor dimmedBackgroundImageActor )
+PushButton CreatePushButton( Actor unselectedImageActor, Actor selectedImageActor, Actor backgroundImageActor,
+ Actor disabledUnselectedImageActor, Actor disabledBackgroundImageActor )
{
PushButton button = Toolkit::PushButton::New();
- if( releasedImageActor )
+ if( unselectedImageActor )
{
- button.SetButtonImage( CreateAlignedImage( releasedImageActor ) );
+ button.SetButtonImage( CreateAlignedImage( unselectedImageActor ) );
}
- if( pressedImageActor )
+ if( selectedImageActor )
{
- button.SetPressedImage( CreateAlignedImage( pressedImageActor ) );
+ button.SetSelectedImage( CreateAlignedImage( selectedImageActor ) );
}
if( backgroundImageActor )
button.SetBackgroundImage( CreateAlignedImage( backgroundImageActor ) );
}
- if( dimmedReleasedImageActor )
+ if( disabledUnselectedImageActor )
{
- button.SetDimmedImage( CreateAlignedImage( dimmedReleasedImageActor ) );
+ button.SetDisabledImage( CreateAlignedImage( disabledUnselectedImageActor ) );
}
- if( dimmedBackgroundImageActor )
+ if( disabledBackgroundImageActor )
{
- button.SetDimmedBackgroundImage( CreateAlignedImage( dimmedBackgroundImageActor ) );
+ button.SetDisabledBackgroundImage( CreateAlignedImage( disabledBackgroundImageActor ) );
}
return button;
* @note Images won't be scaled to fill the whole button size.
* @note If an image path is empty, this image is not set to the button.
*
- * @param[in] releasedImagePath Image path to be shown when the button is released.
- * @param[in] pressedImagePath Image path to be shown when the button is pressed.
- * @param[in] backgroundImagePath Image path to be shown as button background.
- * @param[in] dimmedReleasedImagePath Image path to be shown when the button is released and dimmed.
- * @param[in] dimmedBackgroundImagePath Image path to be shown as button background when the button is dimmed.
+ * @param[in] unselectedImagePath Image path to be shown when the button is unselected.
+ * @param[in] selectedImagePath Image path to be shown when the button is selected.
+ * @param[in] backgroundImagePath Image path to be shown as button background.
+ * @param[in] disabledUnselectedImagePath Image path to be shown when the button is unselected and disabled.
+ * @param[in] disabledBackgroundImagePath Image path to be shown as button background when the button is disabled.
* @return A handle to the new push button
*/
-DALI_IMPORT_API PushButton CreatePushButton( const std::string& releasedImagePath, const std::string& pressedImagePath, const std::string& backgroundImagePath,
- const std::string& dimmedReleasedImagePath, const std::string& dimmedBackgroundImagePath );
+DALI_IMPORT_API PushButton CreatePushButton( const std::string& unselectedImagePath, const std::string& selectedImagePath, const std::string& backgroundImagePath,
+ const std::string& disabledUnselectedImagePath, const std::string& disabledBackgroundImagePath );
/**
* @brief Creates a push button with the given images.
* @note Images won't be scaled to fill the whole button size.
* @note If an image is an empty handle, this image is not set to the button.
*
- * @param[in] releasedImageActor Image to be shown when the button is released.
- * @param[in] pressedImageActor Image to be shown when the button is pressed.
- * @param[in] backgroundImageActor Image to be shown as button background.
- * @param[in] dimmedReleasedImageActor Image to be shown when the button is released and dimmed.
- * @param[in] dimmedBackgroundImageActor Image to be shown as button background when the button is dimmed.
+ * @param[in] unselectedImageActor Image to be shown when the button is unselected.
+ * @param[in] selectedImageActor Image to be shown when the button is pressed.
+ * @param[in] backgroundImageActor Image to be shown as button background.
+ * @param[in] disabledUnselectedImageActor Image to be shown when the button is unselected and disabled.
+ * @param[in] disabledBackgroundImageActor Image to be shown as button background when the button is disabled.
* @return A handle to the new pushbutton
*/
-DALI_IMPORT_API PushButton CreatePushButton( Actor releasedImageActor, Actor pressedImageActor, Actor backgroundImageActor,
- Actor dimmedReleasedImageActor, Actor dimmedBackgroundImageActor );
+DALI_IMPORT_API PushButton CreatePushButton( Actor unselectedImageActor, Actor selectedImageActor, Actor backgroundImageActor,
+ Actor disabledUnselectedImageActor, Actor disabledBackgroundImageActor );
/**
* @brief Creates a push button with the given background image.
GetImpl(*this).HideTail();
}
-Popup::TouchedOutsideSignalV2& Popup::OutsideTouchedSignal()
+Popup::TouchedOutsideSignalType& Popup::OutsideTouchedSignal()
{
return GetImpl(*this).OutsideTouchedSignal();
}
-Popup::HiddenSignalV2& Popup::HiddenSignal()
+Popup::HiddenSignalType& Popup::HiddenSignal()
{
return GetImpl(*this).HiddenSignal();
}
POPUP_SHOW, ///< Shown (visible in default size)
};
- typedef SignalV2< void () > TouchedOutsideSignalV2; ///< Touched outside signal type.
- typedef SignalV2< void () > HiddenSignalV2; ///< Hidden signal type.
+ typedef Signal< void () > TouchedOutsideSignalType; ///< Touched outside signal type.
+ typedef Signal< void () > HiddenSignalType; ///< Hidden signal type.
/**
* @brief Signal emitted when user has touched outside of the Dialog.
*/
- TouchedOutsideSignalV2& OutsideTouchedSignal();
+ TouchedOutsideSignalType& OutsideTouchedSignal();
/**
* @brief Signal emitted when popup has been hidden.
*/
- HiddenSignalV2& HiddenSignal();
+ HiddenSignalType& HiddenSignal();
public:
// Signals
static const char* const SCROLL_POSITION_NOTIFIED_SIGNAL_NAME; ///< "scroll-position-notified" signal name
- typedef SignalV2< void ( float ) > ScrollPositionNotifiedSignalType;
+ typedef Signal< void ( float ) > ScrollPositionNotifiedSignalType;
// Properties
static const Property::Index PROPERTY_INDICATOR_HEIGHT_POLICY; ///< name "indicator-height-policy", @see SetIndicatorHeightPolicy(), type STRING
// Signals
static const char* const DOMAIN_CHANGED_SIGNAL_NAME; ///< "domain-changed" signal name
- typedef SignalV2< void ( float min, float max, float size ) > DomainChangedSignalType;
+ typedef Signal< void ( float min, float max, float size ) > DomainChangedSignalType;
static const char* const SCROLL_POSITION_CHANGED_SIGNAL_NAME; ///< "scroll-position-changed" signal name
- typedef SignalV2< void ( float position ) > ScrollPositionChangedSignalType;
+ typedef Signal< void ( float position ) > ScrollPositionChangedSignalType;
/**
* Create a ScrollConnector.
+++ /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/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h>
-
-// INTERNAL HEADERS
-#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-custom-effect-impl.h>
-
-using namespace Dali;
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-ScrollViewCustomEffect ScrollViewCustomEffect::New()
-{
- return ScrollViewCustomEffect(new Internal::ScrollViewCustomEffect());
-}
-
-ScrollViewCustomEffect::ScrollViewCustomEffect()
-{
-
-}
-
-ScrollViewCustomEffect::ScrollViewCustomEffect(Internal::ScrollViewCustomEffect *impl)
-: ScrollViewEffect(impl)
-{
-}
-
-ScrollViewCustomEffect ScrollViewCustomEffect::DownCast( BaseHandle handle )
-{
- return ScrollViewCustomEffect( dynamic_cast<Internal::ScrollViewCustomEffect*>(handle.GetObjectPtr()) );
-}
-
-void ScrollViewCustomEffect::SetPageSpacing(const Vector2& spacing)
-{
- GetImpl(*this).SetPageSpacing(spacing);
-}
-
-void ScrollViewCustomEffect::SetPageTranslation(const Vector3& translation)
-{
- GetImpl(*this).SetPageTranslation(translation);
-}
-
-void ScrollViewCustomEffect::SetPageTranslation(const Vector3& translationIn, const Vector3& translationOut)
-{
- GetImpl(*this).SetPageTranslation(translationIn, translationOut);
-}
-
-void ScrollViewCustomEffect::SetPageTranslationIn(const Vector3& translation)
-{
- GetImpl(*this).SetPageTranslationIn(translation);
-}
-
-void ScrollViewCustomEffect::SetPageTranslationOut(const Vector3& translation)
-{
- GetImpl(*this).SetPageTranslationOut(translation);
-}
-
-void ScrollViewCustomEffect::SetPageTranslateAlphaFunction(AlphaFunction func)
-{
- GetImpl(*this).SetPageTranslateAlphaFunction(func);
-}
-
-void ScrollViewCustomEffect::SetPageTranslateAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut)
-{
- GetImpl(*this).SetPageTranslateAlphaFunction(funcIn, funcOut);
-}
-
-void ScrollViewCustomEffect::SetPageTranslateAlphaFunctionIn(AlphaFunction func)
-{
- GetImpl(*this).SetPageTranslateAlphaFunctionIn(func);
-}
-
-void ScrollViewCustomEffect::SetPageTranslateAlphaFunctionOut(AlphaFunction func)
-{
- GetImpl(*this).SetPageTranslateAlphaFunctionOut(func);
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotation(float angle, const Vector3& axis)
-{
- GetImpl(*this).SetGlobalPageRotation(angle, axis);
-}
-
-void ScrollViewCustomEffect::SetAngledOriginPageRotation(const Vector3& angle)
-{
- GetImpl(*this).SetAngledOriginPageRotation(angle);
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotation(float angleIn, const Vector3& axisIn, float angleOut, const Vector3& axisOut)
-{
- GetImpl(*this).SetGlobalPageRotation(angleIn, axisIn, angleOut, axisOut);
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotationIn(float angle, const Vector3& axis)
-{
- GetImpl(*this).SetGlobalPageRotationIn(angle, axis);
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotationOut(float angle, const Vector3& axis)
-{
- GetImpl(*this).SetGlobalPageRotationOut(angle, axis);
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotationOrigin(const Vector3& origin)
-{
- GetImpl(*this).SetGlobalPageRotationOrigin(origin);
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotationOrigin(const Vector3& originIn, const Vector3& originOut)
-{
- GetImpl(*this).SetGlobalPageRotationOrigin(originIn, originOut);
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotationOriginIn(const Vector3& origin)
-{
- GetImpl(*this).SetGlobalPageRotationOriginIn(origin);
-}
-
-void ScrollViewCustomEffect::SetGlobalPageRotationOriginOut(const Vector3& origin)
-{
- GetImpl(*this).SetGlobalPageRotationOriginOut(origin);
-}
-
-void ScrollViewCustomEffect::SetSwingAngle(const float angle, const Vector3& axis)
-{
- GetImpl(*this).SetSwingAngle(angle, axis);
-}
-
-void ScrollViewCustomEffect::SetSwingAngle(float angleIn, const Vector3& axisIn, float angleOut, const Vector3& axisOut)
-{
- GetImpl(*this).SetSwingAngle(angleIn, axisIn, angleOut, axisOut);
-}
-
-void ScrollViewCustomEffect::SetSwingAngleIn(float angle, const Vector3& axis)
-{
- GetImpl(*this).SetSwingAngleIn(angle, axis);
-}
-
-void ScrollViewCustomEffect::SetSwingAngleOut(float angle, const Vector3& axis)
-{
- GetImpl(*this).SetSwingAngleOut(angle, axis);
-}
-
-void ScrollViewCustomEffect::SetSwingAngleAlphaFunction(AlphaFunction func)
-{
- GetImpl(*this).SetSwingAngleAlphaFunction(func);
-}
-
-void ScrollViewCustomEffect::SetSwingAngleAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut)
-{
- GetImpl(*this).SetSwingAngleAlphaFunction(funcIn, funcOut);
-}
-
-void ScrollViewCustomEffect::SetSwingAngleAlphaFunctionIn(AlphaFunction func)
-{
- GetImpl(*this).SetSwingAngleAlphaFunctionIn(func);
-}
-
-void ScrollViewCustomEffect::SetSwingAngleAlphaFunctionOut(AlphaFunction func)
-{
- GetImpl(*this).SetSwingAngleAlphaFunctionOut(func);
-}
-
-void ScrollViewCustomEffect::SetSwingAnchor(const Vector3& anchor)
-{
- GetImpl(*this).SetSwingAnchor(anchor);
-}
-
-void ScrollViewCustomEffect::SetSwingAnchor(const Vector3& anchorIn, const Vector3& anchorOut)
-{
- GetImpl(*this).SetSwingAnchor(anchorIn, anchorOut);
-}
-
-void ScrollViewCustomEffect::SetSwingAnchorIn(const Vector3& anchor)
-{
- GetImpl(*this).SetSwingAnchorIn(anchor);
-}
-
-void ScrollViewCustomEffect::SetSwingAnchorOut(const Vector3& anchor)
-{
- GetImpl(*this).SetSwingAnchorOut(anchor);
-}
-
-void ScrollViewCustomEffect::SetSwingAnchorAlphaFunction(AlphaFunction func)
-{
- GetImpl(*this).SetSwingAnchorAlphaFunction(func);
-}
-
-void ScrollViewCustomEffect::SetSwingAnchorAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut)
-{
- GetImpl(*this).SetSwingAnchorAlphaFunction(funcIn, funcOut);
-}
-
-void ScrollViewCustomEffect::SetSwingAnchorAlphaFunctionIn(AlphaFunction func)
-{
- GetImpl(*this).SetSwingAnchorAlphaFunctionIn(func);
-}
-
-void ScrollViewCustomEffect::SetSwingAnchorAlphaFunctionOut(AlphaFunction func)
-{
- GetImpl(*this).SetSwingAnchorAlphaFunctionOut(func);
-}
-
-void ScrollViewCustomEffect::SetOpacityThreshold(float thresh)
-{
- GetImpl(*this).SetOpacityThreshold(thresh);
-}
-
-void ScrollViewCustomEffect::SetOpacityThreshold(float threshIn, float threshOut)
-{
- GetImpl(*this).SetOpacityThreshold(threshIn, threshOut);
-}
-
-void ScrollViewCustomEffect::SetOpacityThresholdIn(float thresh)
-{
- GetImpl(*this).SetOpacityThresholdIn(thresh);
-}
-
-void ScrollViewCustomEffect::SetOpacityThresholdOut(float thresh)
-{
- GetImpl(*this).SetOpacityThresholdOut(thresh);
-}
-
-void ScrollViewCustomEffect::SetOpacityAlphaFunction(AlphaFunction func)
-{
- GetImpl(*this).SetOpacityAlphaFunction(func);
-}
-
-void ScrollViewCustomEffect::SetOpacityAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut)
-{
- GetImpl(*this).SetOpacityAlphaFunction(funcIn, funcOut);
-}
-
-void ScrollViewCustomEffect::SetOpacityAlphaFunctionIn(AlphaFunction func)
-{
- GetImpl(*this).SetOpacityAlphaFunctionIn(func);
-}
-
-void ScrollViewCustomEffect::SetOpacityAlphaFunctionOut(AlphaFunction func)
-{
- GetImpl(*this).SetOpacityAlphaFunctionOut(func);
-}
-
-void ScrollViewCustomEffect::ApplyToPage(Actor page, Vector3 pageSize)
-{
- GetImpl(*this).ApplyToPage(page, pageSize);
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
+++ /dev/null
-#ifndef __DALI_TOOLKIT_SCROLL_VIEW_CUSTOM_EFFECT_H__
-#define __DALI_TOOLKIT_SCROLL_VIEW_CUSTOM_EFFECT_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/animation/alpha-functions.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
-
-namespace Dali
-{
-
-class Actor;
-
-namespace Toolkit
-{
-
-namespace Internal DALI_INTERNAL
-{
-class ScrollViewCustomEffect;
-}
-
-/**
- * @brief This class has many transition effects for use when scrolling pages, e.g opacity, rotation, swing, translation.
- *
- * It should be used on the following Actor hierarchy:
- *
- * ScrollView
- * |
- * Page (1..n)
- *
- * You should ensure ScrollView's default constraints have been removed,
- * by calling ScrollView::RemoveConstraintsFromChildren() before applying
- * this effect to ScrollView.
- *
- * Manual operation:
- * ApplyToPage(...) method should be called on every page.
- *
- * Automatic operation:
- * not implemented.
- */
-class DALI_IMPORT_API ScrollViewCustomEffect : public ScrollViewEffect
-{
-public:
- /**
- * @brief Bitflags for effect types.
- */
- enum EFlag
- {
- FlagTranslate = 0x0001, ///< indicates that translation is wanted
- FlagTranslateIn = 0x0002, ///< translating onto the screen is a separate value
- FlagTranslateOut = 0x0004, ///< translating off the screen is a separate value
- FlagTranslateMask = FlagTranslate | FlagTranslateIn | FlagTranslateOut,
- FlagRotate = 0x0008, ///< indicates that a positional rotation is wanted (rotate all pages around a single point like inner cube effect)
- FlagRotateIn = 0x0010, ///< rotating onto the screen is a separate value
- FlagRotateOut = 0x0020, ///< rotating off the screen is a separate value
- FlagRotateAngleForcedOrigin = 0x0040,
- FlagRotateMask = FlagRotate | FlagRotateIn | FlagRotateOut | FlagRotateAngleForcedOrigin,
- FlagRotateOrigin = 0x0080, ///< indicates to use a global origin to rotate all pages around
- FlagRotateOriginIn = 0x0100, ///<
- FlagRotateOriginOut = 0x0200, ///<
- FlagRotateOriginMask = FlagRotateOrigin | FlagRotateOriginIn | FlagRotateOriginOut,
- FlagSwingAngle = 0x0400, ///< indicates that a SwingAngle is wanted (rotate all pages around a single point like inner cube effect)
- FlagSwingAngleIn = 0x0800, ///< SwingAngle onto the screen is a separate value
- FlagSwingAngleOut = 0x1000, ///< SwingAngle off the screen is a separate value
- FlagSwingAngleMask = FlagSwingAngle | FlagSwingAngleIn | FlagSwingAngleOut,
- FlagSwingAnchor = 0x2000, ///< indicates that a swing requires a specified anchor point, otherwise swings around centre of actor (rotate all pages around a single point like inner cube effect)
- FlagSwingAnchorIn = 0x4000, ///< Swing anchor onto the screen is a separate value
- FlagSwingAnchorOut = 0x8000, ///< Swing anchor off the screen is a separate value
- FlagSwingAnchorMask = FlagSwingAnchor | FlagSwingAnchorIn | FlagSwingAnchorOut,
- FlagOpacityThreshold = 0x00010000, ///<
- FlagOpacityThresholdIn = 0x00020000, ///<
- FlagOpacityThresholdOut = 0x00040000, ///<
- FlagOpacityThresholdMask = FlagOpacityThreshold | FlagOpacityThresholdIn | FlagOpacityThresholdOut,
- FlagTranslationAlphaFunctionIn = 0x00080000,
- FlagTranslationAlphaFunctionOut = 0x00100000,
- FlagTranslationAlphaFunctionMask = FlagTranslationAlphaFunctionIn | FlagTranslationAlphaFunctionOut,
- FlagRotateAlphaFunctionIn = 0x00200000,
- FlagRotateAlphaFunctionOut = 0x00400000,
- FlagRotateAlphaFunctionMask = FlagRotateAlphaFunctionIn | FlagRotateAlphaFunctionOut,
- FlagRotateOriginAlphaFunctionIn = 0x00800000,
- FlagRotateOriginAlphaFunctionOut = 0x01000000,
- FlagRotateOriginAlphaFunctionMask = FlagRotateOriginAlphaFunctionIn | FlagRotateOriginAlphaFunctionOut,
- FlagSwingAngleAlphaFunctionIn = 0x02000000,
- FlagSwingAngleAlphaFunctionOut = 0x04000000,
- FlagSwingAngleAlphaFunctionMask = FlagSwingAngleAlphaFunctionIn | FlagSwingAngleAlphaFunctionOut,
- FlagSwingAnchorAlphaFunctionIn = 0x08000000,
- FlagSwingAnchorAlphaFunctionOut = 0x10000000,
- FlagSwingAnchorAlphaFunctionMask = FlagSwingAnchorAlphaFunctionIn | FlagSwingAnchorAlphaFunctionOut,
- FlagOpacityAlphaFunctionIn = 0x20000000,
- FlagOpacityAlphaFunctionOut = 0x40000000,
- FlagOpacityAlphaFunctionMask = FlagOpacityAlphaFunctionIn | FlagOpacityAlphaFunctionOut
- };
-
- /**
- * @brief Create an initialized ScrollViewCustomEffect.
- *
- * @return A handle to a newly allocated Dali resource.
- */
- static ScrollViewCustomEffect New();
-
- /**
- * @brief Create an uninitialized ScrollViewCustomEffect; this can be initialized with ScrollViewCustomEffect::New().
- *
- * Calling member functions with an uninitialized Toolkit::ScrollViewCustomEffect is not allowed.
- */
- ScrollViewCustomEffect();
-
- /**
- * @brief Downcast an Object handle to ScrollViewCustomEffect.
- *
- * If handle points to a ScrollViewCustomEffect the downcast
- * produces valid handle. If not the returned handle is left
- * uninitialized.
- *
- * @param[in] handle Handle to an object
- * @return handle to a ScrollViewCustomEffect or an uninitialized handle
- */
- static ScrollViewCustomEffect DownCast( BaseHandle handle );
-
- /**
- * @brief SetPageSpacing.
- *
- * @param spacing
- */
- void SetPageSpacing(const Vector2& spacing);
-
- /**
- * @brief SetPageTranslation sets a simple translate on/off value.
- *
- * @param translation
- */
- void SetPageTranslation(const Vector3& translation);
-
- /**
- * @brief SetPageTranslation.
- *
- * @param translationIn
- * @param translationOut
- */
- void SetPageTranslation(const Vector3& translationIn, const Vector3& translationOut);
-
- /**
- * @brief SetPageTranslationIn.
- * @param translation
- */
- void SetPageTranslationIn(const Vector3& translation);
-
- /**
- * @brief SetPageTranslationOut.
- *
- * @param translation
- */
- void SetPageTranslationOut(const Vector3& translation);
-
- /**
- * @brief SetPageTranslateAlphaFunction.
- *
- * @param func
- */
- void SetPageTranslateAlphaFunction(AlphaFunction func);
-
- /**
- * @brief SetPageTranslateAlphaFunction.
- *
- * @param funcIn
- * @param funcOut
- */
- void SetPageTranslateAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut);
-
- /**
- * @brief SetPageTranslateAlphaFunctionIn.
- *
- * @param func
- */
- void SetPageTranslateAlphaFunctionIn(AlphaFunction func);
-
- /**
- * @brief SetPageTranslateAlphaFunctionOut.
- * @param func
- */
- void SetPageTranslateAlphaFunctionOut(AlphaFunction func);
-
- /**
- * @brief SetGlobalPageRotation.
- *
- * @param angle
- * @param axis
- */
- void SetGlobalPageRotation(float angle, const Vector3& axis);
-
- /**
- * @brief SetAnglePageRotation uses the angle and page size passed in on creation to create a faked origin (inner cube needs this method).
- *
- * @param angle
- */
- void SetAngledOriginPageRotation(const Vector3& angle);
-
- /**
- * @brief SetGlobalPageRotation.
- *
- * @param angleIn
- * @param axisIn
- * @param angleOut
- * @param axisOut
- */
- void SetGlobalPageRotation(float angleIn, const Vector3& axisIn, float angleOut, const Vector3& axisOut);
-
- /**
- * @brief SetGlobalPageRotationIn.
- *
- * @param angle
- * @param axis
- */
- void SetGlobalPageRotationIn(float angle, const Vector3& axis);
-
- /**
- * @brief SetGlobalPageRotationOut.
- *
- * @param angle
- * @param axis
- */
- void SetGlobalPageRotationOut(float angle, const Vector3& axis);
-
- /**
- * @brief SetPageRotationOrigin Set the origin to rotate all the pages around.
- *
- * - The default value is (0,0,0)
- * @param origin
- */
- void SetGlobalPageRotationOrigin(const Vector3& origin);
-
- /**
- * @brief SetGlobalPageRotationOrigin.
- *
- * @param originIn
- * @param originOut
- */
- void SetGlobalPageRotationOrigin(const Vector3& originIn, const Vector3& originOut);
-
- /**
- * @brief SetGlobalPageRotationOriginIn.
- *
- * @param origin
- */
- void SetGlobalPageRotationOriginIn(const Vector3& origin);
-
- /**
- * @brief SetGlobalPageRotationOriginOut.
- *
- * @param origin
- */
- void SetGlobalPageRotationOriginOut(const Vector3& origin);
-
- /**
- * @brief SetSwingAngle.
- *
- * @param angle
- * @param axis
- */
- void SetSwingAngle(float angle, const Vector3& axis);
-
- /**
- * @brief SetSwingAngle.
- *
- * @param angleIn
- * @param axisIn
- * @param angleOut
- * @param axisOut
- */
- void SetSwingAngle(float angleIn, const Vector3& axisIn, float angleOut, const Vector3& axisOut);
-
- /**
- * @brief SetSwingAngleIn.
- *
- * @param angle
- * @param axis
- */
- void SetSwingAngleIn(float angle, const Vector3& axis);
-
- /**
- * @brief SetSwingAngleOut.
- *
- * @param angle
- * @param axis
- */
- void SetSwingAngleOut(float angle, const Vector3& axis);
-
- /**
- * @brief SetSwingAngleAlphaFunction.
- *
- * @param func
- */
- void SetSwingAngleAlphaFunction(AlphaFunction func);
-
- /**
- * @brief SetSwingAngleAlphaFunction.
- *
- * @param funcIn
- * @param funcOut
- */
- void SetSwingAngleAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut);
-
- /**
- * @brief SetSwingAngleAlphaFunctionIn.
- *
- * @param func
- */
- void SetSwingAngleAlphaFunctionIn(AlphaFunction func);
-
- /**
- * @brief SetSwingAngleAlphaFunctionOut.
- *
- * @param func
- */
- void SetSwingAngleAlphaFunctionOut(AlphaFunction func);
-
- /**
- * @brief SetPageRotationOrigin Set the origin to rotate all the pages around.
- *
- * - The default value is (0,0,0)
- * @param anchor
- */
- void SetSwingAnchor(const Vector3& anchor);
-
- /**
- * @brief SetSwingAnchor.
- *
- * @param anchorIn
- * @param anchorOut
- */
- void SetSwingAnchor(const Vector3& anchorIn, const Vector3& anchorOut);
-
- /**
- * @brief SetSwingAnchorIn.
- *
- * @param anchor
- */
- void SetSwingAnchorIn(const Vector3& anchor);
-
- /**
- * @brief SetSwingAnchorOut.
- *
- * @param anchor
- */
- void SetSwingAnchorOut(const Vector3& anchor);
-
- /**
- * @brief SetSwingAnchorAlphaFunction.
- *
- * @param func
- */
- void SetSwingAnchorAlphaFunction(AlphaFunction func);
-
- /**
- * @brief SetSwingAnchorAlphaFunction.
- *
- * @param funcIn
- * @param funcOut
- */
- void SetSwingAnchorAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut);
-
- /**
- * @brief SetSwingAnchorAlphaFunctionIn.
- *
- * @param func
- */
- void SetSwingAnchorAlphaFunctionIn(AlphaFunction func);
-
- /**
- * @brief SetSwingAnchorAlphaFunctionOut.
- * @param func
- */
- void SetSwingAnchorAlphaFunctionOut(AlphaFunction func);
-
- /**
- * @brief SetOpacityThreshold.
- *
- * @param thresh
- */
- void SetOpacityThreshold(float thresh);
-
- /**
- * @brief SetOpacityThreshold.
- *
- * @param threshIn
- * @param threshOut
- */
- void SetOpacityThreshold(float threshIn, float threshOut);
-
- /**
- * @brief SetOpacityThresholdIn.
- *
- * @param thresh
- */
- void SetOpacityThresholdIn(float thresh);
-
- /**
- * @brief SetOpacityThresholdOut.
- *
- * @param thresh
- */
- void SetOpacityThresholdOut(float thresh);
-
- /**
- * @brief SetOpacityAlphaFunction.
- *
- * @param func
- */
- void SetOpacityAlphaFunction(AlphaFunction func);
-
- /**
- * @brief SetOpacityAlphaFunction.
- *
- * @param funcIn
- * @param funcOut
- */
- void SetOpacityAlphaFunction(AlphaFunction funcIn, AlphaFunction funcOut);
-
- /**
- * @brief SetOpacityAlphaFunctionIn.
- *
- * @param func
- */
- void SetOpacityAlphaFunctionIn(AlphaFunction func);
-
- /**
- * @brief SetOpacityAlphaFunctionOut.
- *
- * @param func
- */
- void SetOpacityAlphaFunctionOut(AlphaFunction func);
-
- /**
- * @brief Applies the effect to a page.
- *
- * @param page the page to apply this effect to
- * @param pageSize not needed, page size is determined by scroll view
-
- */
- void ApplyToPage(Actor page, Vector3 pageSize);
-
-protected:
-
- /**
- * @brief This constructor is used by Dali New() methods.
- *
- * @param [in] impl A pointer to a newly allocated Dali resource
- */
- explicit DALI_INTERNAL ScrollViewCustomEffect( Internal::ScrollViewCustomEffect *impl );
-
-};
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_TOOLKIT_SCROLL_VIEW_CUSTOM_EFFECT_H__
+++ /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/scrollable/scroll-view/scroll-view-effect.h>
-#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
-#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h>
-
-using namespace Dali;
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-const std::string ScrollViewSlideEffect::EFFECT_TIME( "ScrollViewSlideEffect::EFFECT_TIME" );
-const std::string ScrollViewSlideEffect::EFFECT_REFERENCE( "ScrollViewSlideEffect::EFFECT_REFERENCE" );
-const std::string ScrollViewSlideEffect::EFFECT_ACTIVE( "ScrollViewSlideEffect::EFFECT_ACTIVE" );
-
-ScrollViewSlideEffect ScrollViewSlideEffect::New()
-{
- return ScrollViewSlideEffect(new Internal::ScrollViewSlideEffect());
-}
-
-ScrollViewSlideEffect::ScrollViewSlideEffect()
-{
-
-}
-
-ScrollViewSlideEffect::ScrollViewSlideEffect(Internal::ScrollViewSlideEffect *impl)
-: ScrollViewEffect(impl)
-{
-}
-
-bool ScrollViewSlideEffect::GetSlideDirection() const
-{
- return GetImpl(*this).GetSlideDirection();
-}
-
-void ScrollViewSlideEffect::SetSlideDirection(bool vertical)
-{
- GetImpl(*this).SetSlideDirection( vertical );
-}
-
-Vector3 ScrollViewSlideEffect::GetDelayReferenceOffset() const
-{
- return GetImpl(*this).GetDelayReferenceOffset();
-}
-
-void ScrollViewSlideEffect::SetDelayReferenceOffset(const Vector3& offset)
-{
- GetImpl(*this).SetDelayReferenceOffset(offset);
-}
-
-float ScrollViewSlideEffect::GetMaxDelayDuration() const
-{
- return GetImpl(*this).GetMaxDelayDuration();
-}
-
-void ScrollViewSlideEffect::SetMaxDelayDuration(float offset)
-{
- GetImpl(*this).SetMaxDelayDuration(offset);
-}
-
-ScrollViewSlideEffect ScrollViewSlideEffect::DownCast( BaseHandle handle )
-{
- return ScrollViewSlideEffect( dynamic_cast<Internal::ScrollViewSlideEffect*>(handle.GetObjectPtr()) );
-}
-
-void ScrollViewSlideEffect::ApplyToActor( Actor child,
- float delayMin,
- float delayMax )
-{
- GetImpl(*this).ApplyToActor( child,
- delayMin,
- delayMax );
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
+++ /dev/null
-#ifndef __DALI_TOOLKIT_SCROLL_VIEW_SLIDE_EFFECT_H__
-#define __DALI_TOOLKIT_SCROLL_VIEW_SLIDE_EFFECT_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
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
-
-namespace Dali
-{
-
-class Actor;
-
-namespace Toolkit
-{
-
-class ScrollViewEffect;
-
-namespace Internal DALI_INTERNAL
-{
-class ScrollViewSlideEffect;
-}
-
-/**
- * @brief ScrollView effect that uses slides for transitioning pages.
- */
-class DALI_IMPORT_API ScrollViewSlideEffect : public ScrollViewEffect
-{
-public:
- static const std::string EFFECT_TIME; ///< Effect time property name
- static const std::string EFFECT_REFERENCE; ///< Effect reference property name
- static const std::string EFFECT_ACTIVE; ///< Effect active property name
-
-public:
-
- /**
- * @brief Create an initialized ScrollViewSlideEffect.
- *
- * @return A handle to a newly allocated Dali resource.
- */
- static ScrollViewSlideEffect New();
-
- /**
- * @brief Create an uninitialized ScrollViewSlideEffect; this can be initialized with ScrollViewSlideEffect::New().
- *
- * Calling member functions with an uninitialized Toolkit::ScrollViewSlideEffect is not allowed.
- */
- ScrollViewSlideEffect();
-
- /**
- * @brief Downcast an Object handle to ScrollViewSlideEffect.
- *
- * If handle points to a ScrollViewSlideEffect the downcast produces
- * valid handle. If not the returned handle is left uninitialized.
- *
- * @param[in] handle Handle to an object
- * @return handle to a ScrollViewSlideEffect or an uninitialized handle
- */
- static ScrollViewSlideEffect DownCast( BaseHandle handle );
-
- /**
- * @brief Gets the slide direction for this effect.
- *
- * @return The slide direction (true = vertical, false = horizontal)
- */
- bool GetSlideDirection() const;
-
- /**
- * @brief Sets the slide direction for this effect.
- *
- * If the direction has been set to horizontal (false), then
- * the user will see the Actors have a delay in horizontal movement
- * based on the vertical distance the actor is away from the initial drag point.
- * If the direction has been set to vertical (true), then the
- * user will experience the opposite effect (i.e. delay in the vertical movement).
- * @param[in] vertical The slide direction (true = vertical, false = horizontal)
- * (default is horizontal i.e. false)
- */
- void SetSlideDirection(bool vertical);
-
- /**
- * @brief Gets the delay reference offset for this effect.
- *
- * @return The delay reference offset (Vector3::ZERO - indicates no offset)
- */
- Vector3 GetDelayReferenceOffset() const;
-
- /**
- * @brief Sets an offset for where the central delay point on the scroll-view should be
- * when dragging.
- *
- * By default the offset is 0. Which means that the point where the user drags
- * the scroll-view content should have no delay, and the further away from this
- * point, the delay should increase. Adjusting this offset to for example
- * 0.0f, -stageSize.height * 0.5f, will mean that dragging the center of the stage
- * will result in the content at the top of the stage moving with no delay, and
- * the further away from this point (top of stage), the delay should increase.
- * @param[in] offset The offset in local coordinates, relative to the ScrollView.
- */
- void SetDelayReferenceOffset(const Vector3& offset);
-
- /**
- * @brief Gets the maximum duration of the effect after scrolling completes.
- *
- * @return The duration in seconds
- */
- float GetMaxDelayDuration() const;
-
- /**
- * @brief Sets the maximum duration of the effect after scrolling completes.
- *
- * @param[in] duration The duration in seconds (>= 0.0f, default is 0.25 seconds)
- */
- void SetMaxDelayDuration(float duration);
-
- /**
- * @brief Manually apply effect to an Actor.
- *
- * @param[in] child The child Actor to be affected by this effect.
- * @param[in] delayMin The minimum delay coefficient for Actors at the
- * scroll-view touch point. Set to 0 for instantaneous, and 1 for infinite delay.
- * Default is 0.5f
- * @param[in] delayMax The maximum delay coefficient for Actors at the
- * scroll-view approx 1 ScrollView size from the touch point. Set to 0 for
- * instantaneous, and 1 for infinite delay. Default is 0.99f (a noticable delay)
- */
- void ApplyToActor( Actor child,
- float delayMin = 0.5f,
- float delayMax = 0.95f );
-
-protected:
-
- /**
- * @brief This constructor is used by Dali New() methods.
- *
- * @param [in] impl A pointer to a newly allocated Dali resource
- */
- explicit DALI_INTERNAL ScrollViewSlideEffect(Internal::ScrollViewSlideEffect *impl);
-
-};
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_TOOLKIT_SCROLL_VIEW_SLIDE_EFFECT_H__
GetImpl(*this).ApplyEffect(effect);
}
-ScrollViewEffect ScrollView::ApplyEffect(ScrollView::PageEffect effect)
-{
- return GetImpl(*this).ApplyEffect(effect);
-}
-
void ScrollView::RemoveEffect(ScrollViewEffect effect)
{
GetImpl(*this).RemoveEffect(effect);
GetImpl(*this).UnbindActor(child);
}
-ScrollView::SnapStartedSignalV2& ScrollView::SnapStartedSignal()
+ScrollView::SnapStartedSignalType& ScrollView::SnapStartedSignal()
{
return GetImpl(*this).SnapStartedSignal();
}
class DALI_IMPORT_API ScrollView : public Scrollable
{
public:
- /// Page effect types
- enum PageEffect
- {
- PageEffectNone, ///< No Effect (Standard ScrollView)
- PageEffectOuterCube, ///< 3D Rotating Cube Effect
- PageEffectDepth, ///< Depth Effect
- PageEffectInnerCube, ///< Page Cube Effect
- PageEffectCarousel, ///< Page Carousel Effect
- PageEffectSpiral, ///< Page Spiral Effect
-
- Total ///< The total number of effect types
- };
// Custom properties
float duration; ///< Duration of snap animation.
};
- typedef SignalV2< void ( const SnapEvent& ) > SnapStartedSignalV2; ///< SnapStarted signal type
+ typedef Signal< void ( const SnapEvent& ) > SnapStartedSignalType; ///< SnapStarted signal type
/**
* @brief Signal emitted when the ScrollView has started to snap or flick (it tells the target
* position, scale, rotation for the snap or flick)
*/
- SnapStartedSignalV2& SnapStartedSignal();
+ SnapStartedSignalType& SnapStartedSignal();
public:
void ApplyEffect(ScrollViewEffect effect);
/**
- * @brief ApplyEffect Applies a predefined effect.
- *
- * @param[in] effect enum for the predefined effect
- * @return The scrollview effect that was applied
- */
- ScrollViewEffect ApplyEffect(ScrollView::PageEffect effect);
-
- /**
* @brief Remove Effect from ScrollView.
*
* @param[in] effect The effect to remove.
return Control::DownCast<Scrollable, Internal::Scrollable>(handle);
}
-Scrollable::ScrollStartedSignalV2& Scrollable::ScrollStartedSignal()
+Scrollable::ScrollStartedSignalType& Scrollable::ScrollStartedSignal()
{
return GetImpl(*this).ScrollStartedSignal();
}
-Scrollable::ScrollUpdatedSignalV2& Scrollable::ScrollUpdatedSignal()
+Scrollable::ScrollUpdatedSignalType& Scrollable::ScrollUpdatedSignal()
{
return GetImpl(*this).ScrollUpdatedSignal();
}
-Scrollable::ScrollCompletedSignalV2& Scrollable::ScrollCompletedSignal()
+Scrollable::ScrollCompletedSignalType& Scrollable::ScrollCompletedSignal()
{
return GetImpl(*this).ScrollCompletedSignal();
}
-Scrollable::ScrollClampedSignalV2& Scrollable::ScrollClampedSignal()
+Scrollable::ScrollClampedSignalType& Scrollable::ScrollClampedSignal()
{
return GetImpl(*this).ScrollClampedSignal();
}
public:
- typedef SignalV2< void ( const Vector3& ) > ScrollStartedSignalV2; ///< ScrollStarted signal type
- typedef SignalV2< void ( const Vector3& ) > ScrollCompletedSignalV2; ///< ScrollCompleted signal type
- typedef SignalV2< void ( const Vector3& ) > ScrollUpdatedSignalV2; ///< Scroll updated signal type
- typedef SignalV2< void ( const ClampEvent& ) > ScrollClampedSignalV2; ///< Scroll clamped signal type
+ typedef Signal< void ( const Vector3& ) > ScrollStartedSignalType; ///< ScrollStarted signal type
+ typedef Signal< void ( const Vector3& ) > ScrollCompletedSignalType; ///< ScrollCompleted signal type
+ typedef Signal< void ( const Vector3& ) > ScrollUpdatedSignalType; ///< Scroll updated signal type
+ typedef Signal< void ( const ClampEvent& ) > ScrollClampedSignalType; ///< Scroll clamped signal type
/**
* @brief Signal emitted when the Scrollable has moved (whether by touch or animation).
*/
- ScrollStartedSignalV2& ScrollStartedSignal();
+ ScrollStartedSignalType& ScrollStartedSignal();
/**
* @brief Signal emitted when the Scrollable has moved (whether by touch or animation).
*/
- ScrollUpdatedSignalV2& ScrollUpdatedSignal();
+ ScrollUpdatedSignalType& ScrollUpdatedSignal();
/**
* @brief Signal emitted when the Scrollable has completed movement (whether by touch or animation).
*/
- ScrollCompletedSignalV2& ScrollCompletedSignal();
+ ScrollCompletedSignalType& ScrollCompletedSignal();
/**
* @brief Signal emitted when the Scrollable is pushing against a domain boundary
*
* @return The signal to connect to
*/
- ScrollClampedSignalV2& ScrollClampedSignal();
+ ScrollClampedSignalType& ScrollClampedSignal();
public:
$(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-custom-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-slide-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-controls/text-label.cpp \
$(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-custom-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_src_dir)/controls/scrollable/scroll-view/scroll-view-slide-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
return GetImpl(*this).GetFocusGroup(actor);
}
-FocusManager::FocusChangedSignalV2& FocusManager::FocusChangedSignal()
+FocusManager::FocusChangedSignalType& FocusManager::FocusChangedSignal()
{
return GetImpl(*this).FocusChangedSignal();
}
-FocusManager::FocusOvershotSignalV2& FocusManager::FocusOvershotSignal()
+FocusManager::FocusOvershotSignalType& FocusManager::FocusOvershotSignal()
{
return GetImpl(*this).FocusOvershotSignal();
}
-FocusManager::FocusedActorActivatedSignalV2& FocusManager::FocusedActorActivatedSignal()
+FocusManager::FocusedActorActivatedSignalType& FocusManager::FocusedActorActivatedSignal()
{
return GetImpl(*this).FocusedActorActivatedSignal();
}
public:
/// @brief Focus changed signal
- typedef SignalV2< void ( Actor, Actor ) > FocusChangedSignalV2;
+ typedef Signal< void ( Actor, Actor ) > FocusChangedSignalType;
/// @brief Focus overshooted signal
- typedef SignalV2< void ( Actor, FocusOvershotDirection ) > FocusOvershotSignalV2;
+ typedef Signal< void ( Actor, FocusOvershotDirection ) > FocusOvershotSignalType;
/// @brief Focused actor activated signal
- typedef SignalV2< void ( Actor ) > FocusedActorActivatedSignalV2;
+ typedef Signal< void ( Actor ) > FocusedActorActivatedSignalType;
/**
* @brief Create a FocusManager handle; this can be initialised with FocusManager::New().
* @pre The Object has been initialized.
* @return The signal to connect to.
*/
- FocusChangedSignalV2& FocusChangedSignal();
+ FocusChangedSignalType& FocusChangedSignal();
/**
* @brief This signal is emitted when there is no way to move focus further.
* @pre The Object has been initialized.
* @return The signal to connect to.
*/
- FocusOvershotSignalV2& FocusOvershotSignal();
+ FocusOvershotSignalType& FocusOvershotSignal();
/**
* @brief This signal is emitted when the current focused actor is activated.
* @pre The Object has been initialized.
* @return The signal to connect to.
*/
- FocusedActorActivatedSignalV2& FocusedActorActivatedSignal();
+ FocusedActorActivatedSignalType& FocusedActorActivatedSignal();
private:
return GetImpl(*this).GetFocusIndicatorActor();
}
-KeyboardFocusManager::PreFocusChangeSignalV2& KeyboardFocusManager::PreFocusChangeSignal()
+KeyboardFocusManager::PreFocusChangeSignalType& KeyboardFocusManager::PreFocusChangeSignal()
{
return GetImpl(*this).PreFocusChangeSignal();
}
-KeyboardFocusManager::FocusChangedSignalV2& KeyboardFocusManager::FocusChangedSignal()
+KeyboardFocusManager::FocusChangedSignalType& KeyboardFocusManager::FocusChangedSignal()
{
return GetImpl(*this).FocusChangedSignal();
}
-KeyboardFocusManager::FocusGroupChangedSignalV2& KeyboardFocusManager::FocusGroupChangedSignal()
+KeyboardFocusManager::FocusGroupChangedSignalType& KeyboardFocusManager::FocusGroupChangedSignal()
{
return GetImpl(*this).FocusGroupChangedSignal();
}
-KeyboardFocusManager::FocusedActorActivatedSignalV2& KeyboardFocusManager::FocusedActorActivatedSignal()
+KeyboardFocusManager::FocusedActorActivatedSignalType& KeyboardFocusManager::FocusedActorActivatedSignal()
{
return GetImpl(*this).FocusedActorActivatedSignal();
}
public:
/// @brief Pre focus change signal
- typedef SignalV2< Actor ( Actor, Actor, Control::KeyboardFocusNavigationDirection ) > PreFocusChangeSignalV2;
+ typedef Signal< Actor ( Actor, Actor, Control::KeyboardFocusNavigationDirection ) > PreFocusChangeSignalType;
/// @brief Focus changed signal
- typedef SignalV2< void ( Actor, Actor ) > FocusChangedSignalV2;
+ typedef Signal< void ( Actor, Actor ) > FocusChangedSignalType;
/// @brief Focus group changed signal
- typedef SignalV2< void ( Actor, bool ) > FocusGroupChangedSignalV2;
+ typedef Signal< void ( Actor, bool ) > FocusGroupChangedSignalType;
/// @brief Focused actor activated signal
- typedef SignalV2< void ( Actor ) > FocusedActorActivatedSignalV2;
+ typedef Signal< void ( Actor ) > FocusedActorActivatedSignalType;
/**
* @brief Create a KeyboardFocusManager handle; this can be initialised with KeyboardFocusManager::New().
* @pre The Object has been initialized.
* @return The signal to connect to.
*/
- PreFocusChangeSignalV2& PreFocusChangeSignal();
+ PreFocusChangeSignalType& PreFocusChangeSignal();
/**
* @brief This signal is emitted after the current focused actor has been changed.
* @pre The Object has been initialized.
* @return The signal to connect to.
*/
- FocusChangedSignalV2& FocusChangedSignal();
+ FocusChangedSignalType& FocusChangedSignal();
/**
* @brief This signal is emitted when the focus group has been changed.
* @pre The Object has been initialized.
* @return The signal to connect to.
*/
- FocusGroupChangedSignalV2& FocusGroupChangedSignal();
+ FocusGroupChangedSignalType& FocusGroupChangedSignal();
/**
* @brief This signal is emitted when the current focused actor is activated.
* @pre The Object has been initialized.
* @return The signal to connect to.
*/
- FocusedActorActivatedSignalV2& FocusedActorActivatedSignal();
+ FocusedActorActivatedSignalType& FocusedActorActivatedSignal();
// Not intended for application developers
return GetImpl(*this).IsKeyboardListener(control);
}
-KeyInputFocusManager::KeyInputFocusChangedSignalV2& KeyInputFocusManager::KeyInputFocusChangedSignal()
+KeyInputFocusManager::KeyInputFocusChangedSignalType& KeyInputFocusManager::KeyInputFocusChangedSignal()
{
return GetImpl(*this).KeyInputFocusChangedSignal();
}
-KeyInputFocusManager::UnhandledKeyEventSignalV2& KeyInputFocusManager::UnhandledKeyEventSignal()
+KeyInputFocusManager::UnhandledKeyEventSignalType& KeyInputFocusManager::UnhandledKeyEventSignal()
{
return GetImpl(*this).UnhandledKeyEventSignal();
}
static const char* const SIGNAL_UNHANDLED_KEY_EVENT;
// KeyInputFocusChanged
- typedef SignalV2< void (Control, Control) > KeyInputFocusChangedSignalV2;
+ typedef Signal< void (Control, Control) > KeyInputFocusChangedSignalType;
// Unhandled Key Event
- typedef SignalV2< void (const KeyEvent&) > UnhandledKeyEventSignalV2;
+ typedef Signal< void (const KeyEvent&) > UnhandledKeyEventSignalType;
public:
* @endcode
* @return The signal to connect to.
*/
- KeyInputFocusChangedSignalV2& KeyInputFocusChangedSignal();
+ KeyInputFocusChangedSignalType& KeyInputFocusChangedSignal();
/**
* This signal is emitted when a key event was received, and none of the focused controls on the stage have consumed it.
* @endcode
* @return The signal to connect to.
*/
- UnhandledKeyEventSignalV2& UnhandledKeyEventSignal();
+ UnhandledKeyEventSignalType& UnhandledKeyEventSignal();
private:
public:
// Signals
- typedef SignalV2< void ( StyleManager, StyleChange ) > StyleChangeSignalType;
+ typedef Signal< void ( StyleManager, StyleChange ) > StyleChangeSignalType;
/**
* @brief Create a StyleManager handle; this can be initialised with StyleManager::Get()
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,
#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-custom-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-slide-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/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/magnifier/magnifier.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>
{
// root actor to parent all user added actors, needed to allow us to set that subtree as exclusive for our child render task
mChildrenRoot.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
- mChildrenRoot.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) ); // same size as BloomView object
-
//////////////////////////////////////////////////////
// Create shaders
// Create an ImageActor for compositing the result (scene and bloom textures) to output
mCompositeImageActor = ImageActor::New();
mCompositeImageActor.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
- mCompositeImageActor.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) ); // same size as BloomView object
mCompositeImageActor.SetShaderEffect( mCompositeShader );
mCompositeImageActor.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME
// Create an ImageActor for holding final result, i.e. the blurred image. This will get rendered to screen later, via default / user render task
mTargetImageActor = ImageActor::New();
mTargetImageActor.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
- mTargetImageActor.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) ); // same size as BloomView object
mTargetImageActor.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME
SetupProperties();
}
-/**
- * ZrelativeToYconstraint
- *
- * f(current, property, scale) = Vector3(current.x, current.y, property.y * scale)
- */
-struct ZrelativeToYconstraint
-{
- ZrelativeToYconstraint( float scale )
- : mScale( scale )
- {}
-
- Vector3 operator()(const Vector3& current,
- const PropertyInput& property)
- {
- Vector3 v;
-
- v.x = current.x;
- v.y = current.y;
- v.z = property.GetVector3().y * mScale;
-
- return v;
- }
-
- float mScale;
-};
-
void BloomView::OnControlSizeSet(const Vector3& targetSize)
{
mTargetSize = Vector2(targetSize);
+ mChildrenRoot.SetSize(targetSize);
+ mCompositeImageActor.SetSize(targetSize);
+ mTargetImageActor.SetSize(targetSize);
+
+ // Children render camera must move when GaussianBlurView object is
+ // resized. This is since we cannot change render target size - so we need
+ // to remap the child actors' rendering accordingly so they still exactly
+ // fill the render target. Note that this means the effective resolution of
+ // the child render changes as the GaussianBlurView object changes size,
+ // this is the trade off for not being able to modify render target size
+ // Change camera z position based on GaussianBlurView actor height
+ float cameraPosConstraintScale = 0.5f / tanf(ARBITRARY_FIELD_OF_VIEW * 0.5f);
+ mRenderFullSizeCamera.SetZ( mTargetSize.height * cameraPosConstraintScale);
// if we are already on stage, need to update render target sizes now to reflect the new size of this actor
if(Self().OnStage())
float cameraPosConstraintScale = 0.5f / tanf(ARBITRARY_FIELD_OF_VIEW * 0.5f);
mRenderFullSizeCamera.SetPosition(0.0f, 0.0f, mTargetSize.height * cameraPosConstraintScale);
-
- // Children render camera must move when GaussianBlurView object is
- // resized. This is since we cannot change render target size - so we need
- // to remap the child actors' rendering accordingly so they still exactly
- // fill the render target. Note that this means the effective resolution of
- // the child render changes as the GaussianBlurView object changes size,
- // this is the trade off for not being able to modify render target size
- // Change camera z position based on GaussianBlurView actor height
-
- mRenderFullSizeCamera.RemoveConstraints();
- mRenderFullSizeCamera.ApplyConstraint( Constraint::New<Vector3>( Actor::POSITION, ParentSource( Actor::SIZE ), ZrelativeToYconstraint(cameraPosConstraintScale) ) );
-
-
//////////////////////////////////////////////////////
// Pass size change onto GaussianBlurView, so it matches
mGaussianBlurView.SetSize(mTargetSize);
// 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:
/**
}
mActorForResult = Actor::New();
mActorForResult.SetParentOrigin( ParentOrigin::CENTER );
- mActorForResult.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ mActorForResult.SetSize( mTargetSize );
mActorForResult.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) );
Self().Add( mActorForResult );
mEffectOffsetPropertyIndex = self.RegisterProperty(EFFECT_OFFSET_PROPERTY_NAME, EFFECT_OFFSET_DEFAULT);
mEffectColorPropertyIndex = self.RegisterProperty(EFFECT_COLOR_PROPERTY_NAME, EFFECT_COLOR_DEFAULT);
mActorPostFilter.ApplyConstraint( Constraint::New<Vector3>( Actor::POSITION, Source( self, mEffectOffsetPropertyIndex ), EqualToConstraint() ) );
- mActorPostFilter.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
mActorPostFilter.ApplyConstraint( Constraint::New<Vector4>( Actor::COLOR, Source( self, mEffectColorPropertyIndex ), EqualToConstraint() ) );
}
mActorForChildren = ImageActor::New();
mActorForChildren.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
- mActorForChildren.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) ); // same size as EffectsView object
mActorForChildren.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) );
mActorPostFilter = ImageActor::New();
mActorPostFilter.SetParentOrigin( ParentOrigin::CENTER );
- mActorPostFilter.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) ); // same size as EffectsView object
mActorPostFilter.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) );
mActorPostFilter.SetShaderEffect( ShaderEffect::New( "", EFFECTS_VIEW_FRAGMENT_SOURCE ) );
{
AllocateResources();
}
+
+ if( mActorForResult )
+ {
+ mActorForResult.SetSize( targetSize );
+ }
+ if( mActorForChildren )
+ {
+ mActorForChildren.SetSize( targetSize );
+ }
+ if( mActorPostFilter )
+ {
+ mActorPostFilter.SetSize( targetSize );
+ }
+
+ // Children render camera must move when EffectsView object is resized.
+ // This is since we cannot change render target size - so we need to remap the child actors' rendering
+ // accordingly so they still exactly fill the render target.
+ // Note that this means the effective resolution of the child render changes as the EffectsView object
+ // changes size, this is the trade off for not being able to modify render target size
+ // Change camera z position based on EffectsView actor height
+ if( mCameraForChildren )
+ {
+ const float cameraPosScale( 0.5f / tanf(ARBITRARY_FIELD_OF_VIEW * 0.5f) );
+ mCameraForChildren.SetZ( targetSize.height * cameraPosScale );
+ }
+
+ const size_t numFilters( mFilters.size() );
+ for( size_t i = 0; i < numFilters; ++i )
+ {
+ mFilters[i]->SetSize( mTargetSize );
+ }
+
}
void EffectsView::OnStageDisconnection()
void EffectsView::SetupCameras()
{
- const float cameraPosConstraintScale( 0.5f / tanf(ARBITRARY_FIELD_OF_VIEW * 0.5f) );
+ const float cameraPosScale( 0.5f / tanf(ARBITRARY_FIELD_OF_VIEW * 0.5f) );
// Create and place a camera for the children render, corresponding to its render target size
mCameraForChildren.SetFieldOfView(ARBITRARY_FIELD_OF_VIEW);
mCameraForChildren.SetNearClippingPlane(1.0f);
mCameraForChildren.SetAspectRatio(mTargetSize.width / mTargetSize.height);
mCameraForChildren.SetType(Dali::Camera::FREE_LOOK); // camera orientation based solely on actor
- mCameraForChildren.SetPosition(0.0f, 0.0f, mTargetSize.height * cameraPosConstraintScale);
+ mCameraForChildren.SetPosition(0.0f, 0.0f, mTargetSize.height * cameraPosScale);
mCameraForChildren.SetRotation(Quaternion(M_PI, Vector3::YAXIS));
-
- // Children render camera must move when EffectsView object is resized.
- // This is since we cannot change render target size - so we need to remap the child actors' rendering
- // accordingly so they still exactly fill the render target.
- // Note that this means the effective resolution of the child render changes as the EffectsView object
- // changes size, this is the trade off for not being able to modify render target size
- // Change camera z position based on EffectsView actor height
- mCameraForChildren.RemoveConstraints();
- mCameraForChildren.ApplyConstraint( Constraint::New<float>( Actor::POSITION_Z, ParentSource( Actor::SIZE_HEIGHT ), RelativeToConstraintFloat(cameraPosConstraintScale) ) );
+ mCameraForChildren.SetZ( mTargetSize.height * cameraPosScale );
}
void EffectsView::CreateRenderTasks()
{
// root actor to parent all user added actors, needed to allow us to set that subtree as exclusive for our child render task
mChildrenRoot.SetParentOrigin(ParentOrigin::CENTER);
- mChildrenRoot.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) ); // same size as GaussianBlurView object
-
//////////////////////////////////////////////////////
// Create shaders
{
mImageActorComposite = ImageActor::New();
mImageActorComposite.SetParentOrigin(ParentOrigin::CENTER);
- mImageActorComposite.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) ); // same size as GaussianBlurView object
mImageActorComposite.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME
mImageActorComposite.SetOpacity(GAUSSIAN_BLUR_VIEW_DEFAULT_BLUR_STRENGTH); // ensure alpha is enabled for this object and set default value
// Create an ImageActor for holding final result, i.e. the blurred image. This will get rendered to screen later, via default / user render task
mTargetActor = ImageActor::New();
mTargetActor.SetParentOrigin(ParentOrigin::CENTER);
- mTargetActor.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) ); // same size as GaussianBlurView object
mTargetActor.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) ); // FIXME
{
mTargetSize = Vector2(targetSize);
+ mChildrenRoot.SetSize(targetSize);
+
+ if( !mBlurUserImage )
+ {
+ mImageActorComposite.SetSize(targetSize);
+ mTargetActor.SetSize(targetSize);
+
+ // Children render camera must move when GaussianBlurView object is resized. This is since we cannot change render target size - so we need to remap the child actors' rendering
+ // accordingly so they still exactly fill the render target. Note that this means the effective resolution of the child render changes as the GaussianBlurView object changes
+ // size, this is the trade off for not being able to modify render target size
+ // Change camera z position based on GaussianBlurView actor height
+ float cameraPosConstraintScale = 0.5f / tanf(ARBITRARY_FIELD_OF_VIEW * 0.5f);
+ mRenderFullSizeCamera.SetZ(mTargetSize.height * cameraPosConstraintScale);
+ }
+
+
// if we are already on stage, need to update render target sizes now to reflect the new size of this actor
if(Self().OnStage())
{
float cameraPosConstraintScale = 0.5f / tanf(ARBITRARY_FIELD_OF_VIEW * 0.5f);
mRenderFullSizeCamera.SetPosition(0.0f, 0.0f, mTargetSize.height * cameraPosConstraintScale);
- // Children render camera must move when GaussianBlurView object is resized. This is since we cannot change render target size - so we need to remap the child actors' rendering
- // accordingly so they still exactly fill the render target. Note that this means the effective resolution of the child render changes as the GaussianBlurView object changes
- // size, this is the trade off for not being able to modify render target size
- // Change camera z position based on GaussianBlurView actor height
- mRenderFullSizeCamera.RemoveConstraints();
- mRenderFullSizeCamera.ApplyConstraint( Constraint::New<Vector3>( Actor::POSITION, ParentSource( Actor::SIZE ), ZrelativeToYconstraint(cameraPosConstraintScale) ) );
-
// create offscreen buffer of new size to render our child actors to
mRenderTargetForRenderingChildren = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::Unused );
+++ /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__
// 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
#include <dali-toolkit/internal/controls/magnifier/magnifier-impl.h>
// EXTERNAL INCLUDES
-#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/animation/constraints.h>
#include <dali/public-api/common/stage.h>
#include <dali/public-api/render-tasks/render-task-list.h>
mPropertySourcePosition = self.RegisterProperty( Toolkit::Magnifier::SOURCE_POSITION_PROPERTY_NAME, Vector3::ZERO );
Vector2 stageSize(Stage::GetCurrent().GetSize());
- Layer dummyLayer = Layer::New();
- Stage().GetCurrent().Add(dummyLayer);
- dummyLayer.SetParentOrigin(ParentOrigin::CENTER);
-
// NOTE:
// sourceActor is a dummy delegate actor that takes the source property position,
// and generates a WORLD_POSITION, which is 1 frame behind the source property.
// Perhaps this is a bug in the way the constraint system factors into what is dirty
// and what is not.
mSourceActor = Actor::New();
- dummyLayer.Add(mSourceActor);
+ Stage().GetCurrent().Add(mSourceActor);
mSourceActor.SetParentOrigin(ParentOrigin::CENTER);
Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
Source( self, mPropertySourcePosition ),
//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
bool Magnifier::GetFrameVisibility() const
{
- return mFrameLayer;
+ return mFrame;
}
void Magnifier::SetFrameVisibility(bool visible)
{
- if(visible && !mFrameLayer)
+ if(visible && !mFrame)
{
Actor self(Self());
- Layer mFrameLayer = Layer::New();
- mFrameLayer.SetParentOrigin( ParentOrigin::CENTER );
- Stage::GetCurrent().Add(mFrameLayer);
-
Image image = Image::New( DEFAULT_FRAME_IMAGE_PATH );
- ImageActor frame = ImageActor::New( image );
- frame.SetDrawMode(DrawMode::OVERLAY);
- frame.SetStyle( ImageActor::STYLE_NINE_PATCH );
+ mFrame = ImageActor::New( image );
+ mFrame.SetDrawMode(DrawMode::OVERLAY);
+ mFrame.SetStyle( ImageActor::STYLE_NINE_PATCH );
+ mFrame.SetPositionInheritanceMode(DONT_INHERIT_POSITION);
+ mFrame.SetInheritScale(true);
- frame.SetNinePatchBorder( Vector4::ONE * IMAGE_BORDER_INDENT );
- mFrameLayer.Add(frame);
-
- // Apply position constraint to the frame
Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
- Source( self, Actor::WORLD_POSITION ),
- EqualToConstraint() );
- frame.ApplyConstraint(constraint);
-
- // Apply scale constraint to the frame
- constraint = Constraint::New<Vector3>( Actor::SCALE,
- Source( self, Actor::SCALE ),
- EqualToConstraint() );
- frame.ApplyConstraint(constraint);
-
- Source(self, Actor::SCALE),
-
- // Apply size constraint to the the frame
- constraint = Constraint::New<Vector3>(Actor::SIZE,
- Source(self, Actor::SIZE),
- ImageBorderSizeConstraint());
- frame.ApplyConstraint(constraint);
+ ParentSource(Actor::WORLD_POSITION),
+ EqualToConstraint());
+ mFrame.ApplyConstraint( constraint );
+
+ mFrame.SetNinePatchBorder( Vector4::ONE * IMAGE_BORDER_INDENT );
+ self.Add(mFrame);
+
+ Vector3 sizeOffset(IMAGE_BORDER_INDENT*2.f - 2.f, IMAGE_BORDER_INDENT*2.f - 2.f, 0.0f);
+ mFrame.SetSize(mActorSize + sizeOffset);
}
- else if(!visible && mFrameLayer)
+ else if(!visible && mFrame)
{
- Stage::GetCurrent().Remove(mFrameLayer);
- mFrameLayer.Reset();
+ UnparentAndReset(mFrame);
}
}
void Magnifier::OnControlSizeSet(const Vector3& targetSize)
{
+ if( mFrame )
+ {
+ Vector3 sizeOffset(IMAGE_BORDER_INDENT*2.f - 2.f, IMAGE_BORDER_INDENT*2.f - 2.f, 0.0f);
+ mFrame.SetSize(targetSize + sizeOffset);
+ }
+
// TODO: Once Camera/CameraActor properties function as proper animatable properties
// this code can disappear.
// whenever the size of the magnifier changes, the field of view needs to change
#include <dali/public-api/actors/camera-actor.h>
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/actors/image-actor.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
RenderTask mTask; ///< Render Task to render the source actor contents.
CameraActor mCameraActor; ///< CameraActor attached to RenderTask
- Layer mFrameLayer; ///< Frame is placed on separate layer added to stage.
+ ImageActor mFrame; ///< The Magnifier Frame
Property::Index mPropertySourcePosition; ///< Source Position ("source-position")
Actor mSourceActor; ///< Source Delegate Actor represents the source position to read.
float mDefaultCameraDistance; ///< Default RenderTask's camera distance from target.
return mBarLayer;
}
-void NavigationControl::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void NavigationControl::OnRelayout( const Vector2& size, ActorSizeContainer& container )
{
const Vector2 setSize( size );
}
}
-Toolkit::NavigationControl::ItemPushedSignalV2& NavigationControl::ItemPushedSignal()
+Toolkit::NavigationControl::ItemPushedSignalType& NavigationControl::ItemPushedSignal()
{
return mItemPushedSignal;
}
-Toolkit::NavigationControl::ItemPoppedSignalV2& NavigationControl::ItemPoppedSignal()
+Toolkit::NavigationControl::ItemPoppedSignalType& NavigationControl::ItemPoppedSignal()
{
return mItemPoppedSignal;
}
/**
* @copydoc Dali::Toolkit::NavigatinControl::ItemPushedSignal()
*/
- Toolkit::NavigationControl::ItemPushedSignalV2& ItemPushedSignal();
+ Toolkit::NavigationControl::ItemPushedSignalType& ItemPushedSignal();
/**
* @copydoc Dali::Toolkit::NavigatinControl::ItemPoppedSignal()
*/
- Toolkit::NavigationControl::ItemPoppedSignalV2& ItemPoppedSignal();
+ Toolkit::NavigationControl::ItemPoppedSignalType& ItemPoppedSignal();
private: // override functions from Control
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
Toolkit::Popup mPopupMenu;
private:
- Toolkit::NavigationControl::ItemPushedSignalV2 mItemPushedSignal; ///< The signal to notify the item push
- Toolkit::NavigationControl::ItemPoppedSignalV2 mItemPoppedSignal; ///< The signal to notify the item pop
+ Toolkit::NavigationControl::ItemPushedSignalType mItemPushedSignal; ///< The signal to notify the item push
+ Toolkit::NavigationControl::ItemPoppedSignalType mItemPoppedSignal; ///< The signal to notify the item pop
};
} // namespace Internal
}
}
-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:
// 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 );
}
}
Toolkit::View handle( GetOwner() );
- mOrientationAnimationStartedSignalV2.Emit( handle, mRotateAnimation, orientation );
+ mOrientationAnimationStartedSignal.Emit( handle, mRotateAnimation, orientation );
mRotateAnimation.Play();
}
mAutoRotateEnabled = enabled;
}
-Toolkit::View::OrientationAnimationStartedSignalV2& View::OrientationAnimationStartedSignal()
+Toolkit::View::OrientationAnimationStartedSignalType& View::OrientationAnimationStartedSignal()
{
- return mOrientationAnimationStartedSignalV2;
+ return mOrientationAnimationStartedSignal;
}
bool View::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
}
}
+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;
/**
* @copydoc Dali::Toolkit::View::AnimationStartedSignalOrientation()
*/
- Toolkit::View::OrientationAnimationStartedSignalV2& OrientationAnimationStartedSignal();
+ Toolkit::View::OrientationAnimationStartedSignalType& OrientationAnimationStartedSignal();
/**
* Connects a callback function with the object's signals.
*/
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::OrientationAnimationStartedSignalV2 mOrientationAnimationStartedSignalV2;
+ Toolkit::View::OrientationAnimationStartedSignalType mOrientationAnimationStartedSignal;
};
} // namespace Internal
$(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 \
// create actor to render input with applied emboss effect
mActorForInput = ImageActor::New( mInputImage );
mActorForInput.SetParentOrigin( ParentOrigin::CENTER );
- mActorForInput.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ mActorForInput.SetSize(mTargetSize);
mActorForInput.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) );
// create internal offscreen for result of horizontal pass
// create an actor to render mImageForHorz for vertical blur pass
mActorForHorz = ImageActor::New( mImageForHorz );
mActorForHorz.SetParentOrigin( ParentOrigin::CENTER );
- mActorForHorz.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ mActorForHorz.SetSize(mTargetSize);
mActorForHorz.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) );
// create internal offscreen for result of the two pass blurred image
// create an actor to blend the blurred image and the input image with the given blur strength
mActorForBlending = ImageActor::New( mBlurredImage );
mActorForBlending.SetParentOrigin( ParentOrigin::CENTER );
- mActorForBlending.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ mActorForBlending.SetSize(mTargetSize);
mActorForBlending.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) );
mRootActor.Add( mActorForInput );
}
}
+void BlurTwoPassFilter::SetSize( const Vector2& size )
+{
+ mTargetSize = size;
+ if( mActorForInput )
+ {
+ mActorForInput.SetSize(mTargetSize);
+ }
+ if( mActorForHorz )
+ {
+ mActorForHorz.SetSize(mTargetSize);
+ }
+ if( mActorForBlending )
+ {
+ mActorForBlending.SetSize(mTargetSize);
+ }
+}
+
Constrainable BlurTwoPassFilter::GetHandleForAnimateBlurStrength()
{
return mShaderForBlending;
/// @copydoc Dali::Toolkit::Internal::ImageFilter::Refresh
virtual void Refresh();
+ /// @copydoc Dali::Toolkit::Internal::ImageFilter::SetSize
+ virtual void SetSize( const Vector2& size );
+
/**
* Get the property index that controls the strength of the blur applied to the image. Useful for animating this property.
* This property represents a value in the range [0.0 - 1.0] where 0.0 is no blur and 1.0 is full blur.
// create actor to render input with applied emboss effect
mActorForInput1 = ImageActor::New( mInputImage );
mActorForInput1.SetParentOrigin( ParentOrigin::CENTER );
- mActorForInput1.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ mActorForInput1.SetSize(mTargetSize);
mActorForInput1.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) );
mActorForInput1.SetColor( Color::WHITE );
mActorForInput2 = ImageActor::New( mInputImage );
mActorForInput2.SetParentOrigin( ParentOrigin::CENTER );
- mActorForInput2.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ mActorForInput2.SetSize(mTargetSize);
mActorForInput2.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) );
mActorForInput2.SetColor( Color::WHITE );
mActorForEmboss1 = ImageActor::New( mImageForEmboss1 );
mActorForEmboss1.SetParentOrigin( ParentOrigin::CENTER );
- mActorForEmboss1.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ mActorForEmboss1.SetSize(mTargetSize);
mActorForEmboss1.SetColor( Color::BLACK );
mActorForEmboss1.SetShaderEffect( ShaderEffect::New( "", COMPOSITE_FRAGMENT_SOURCE ) );
mActorForEmboss2 = ImageActor::New( mImageForEmboss2 );
mActorForEmboss2.SetParentOrigin( ParentOrigin::CENTER );
- mActorForEmboss2.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ mActorForEmboss2.SetSize(mTargetSize);
mActorForEmboss2.SetColor( Color::WHITE );
mActorForEmboss2.SetShaderEffect( ShaderEffect::New( "", COMPOSITE_FRAGMENT_SOURCE ) );
mActorForComposite = Actor::New();
mActorForComposite.SetParentOrigin( ParentOrigin::CENTER );
- mActorForComposite.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ mActorForComposite.SetSize(mTargetSize);
mActorForComposite.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) );
// create custom shader effect
}
}
+void EmbossFilter::SetSize( const Vector2& size )
+{
+ mTargetSize = size;
+ if( mActorForInput1 )
+ {
+ mActorForInput1.SetSize(mTargetSize);
+ }
+ if( mActorForInput2 )
+ {
+ mActorForInput2.SetSize(mTargetSize);
+ }
+ if( mActorForEmboss1 )
+ {
+ mActorForEmboss1.SetSize(mTargetSize);
+ }
+ if( mActorForEmboss2 )
+ {
+ mActorForEmboss2.SetSize(mTargetSize);
+ }
+ if( mActorForComposite )
+ {
+ mActorForComposite.SetSize(mTargetSize);
+ }
+}
+
void EmbossFilter::SetupCamera()
{
// Create and place a camera for the embossing render, corresponding to its render target size
/// @copydoc Dali::Toolkit::Internal::ImageFilter::Refresh
virtual void Refresh();
+ /// @copydoc Dali::Toolkit::Internal::ImageFilter::SetSize
+ virtual void SetSize( const Vector2& size );
+
private:
/**
* Setup position and parameters for camera
* Set size of ImageFilter. Used to create internal offscreen buffers
* @param[in] size THe size.
*/
- void SetSize( const Vector2& size );
+ virtual void SetSize( const Vector2& size );
/**
* Set the pixel format for internal offscreen buffers
// create actor to render input with applied emboss effect
mActorForInput = ImageActor::New( mInputImage );
mActorForInput.SetParentOrigin( ParentOrigin::CENTER );
- mActorForInput.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ mActorForInput.SetSize(mTargetSize);
mActorForInput.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) );
// create internal offscreen for result of horizontal pass
// create an actor to render mImageForHorz for vertical blur pass
mActorForHorz = ImageActor::New( mImageForHorz );
mActorForHorz.SetParentOrigin( ParentOrigin::CENTER );
- mActorForHorz.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+ mActorForHorz.SetSize(mTargetSize);
mActorForHorz.ScaleBy( Vector3(1.0f, -1.0f, 1.0f) );
mRootActor.Add( mActorForInput );
}
}
+void SpreadFilter::SetSize( const Vector2& size )
+{
+ mTargetSize = size;
+ if( mActorForInput )
+ {
+ mActorForInput.SetSize(mTargetSize);
+ }
+ if( mActorForHorz )
+ {
+ mActorForHorz.SetSize(mTargetSize);
+ }
+}
+
void SpreadFilter::SetupCamera()
{
// Create and place a camera for the embossing render, corresponding to its render target size
/// @copydoc Dali::Toolkit::Internal::ImageFilter::Refresh
virtual void Refresh();
+ /// @copydoc Dali::Toolkit::Internal::ImageFilter::SetSize
+ virtual void SetSize( const Vector2& size );
+
private:
/**
* Setup position and parameters for camera
//Emit signal
Toolkit::CubeTransitionEffect handle( this );
- mTransitionCompletedSignalV2.Emit( handle, mCurrentImage );
+ mTransitionCompletedSignal.Emit( handle, mCurrentImage );
}
-Toolkit::CubeTransitionEffect::TransitionCompletedSignalV2& CubeTransitionEffect::TransitionCompletedSignal()
+Toolkit::CubeTransitionEffect::TransitionCompletedSignalType& CubeTransitionEffect::TransitionCompletedSignal()
{
- return mTransitionCompletedSignalV2;
+ return mTransitionCompletedSignal;
}
} // namespace Internal
/**
* @copydoc Toolkit::CubeTransitionEffect::TransitionCompletedSignal()
*/
- Toolkit::CubeTransitionEffect::TransitionCompletedSignalV2& TransitionCompletedSignal();
+ Toolkit::CubeTransitionEffect::TransitionCompletedSignalType& TransitionCompletedSignal();
protected:
private:
- Toolkit::CubeTransitionEffect::TransitionCompletedSignalV2 mTransitionCompletedSignalV2;
+ Toolkit::CubeTransitionEffect::TransitionCompletedSignalType mTransitionCompletedSignal;
};
/**
* Signal type for notifications
*/
- typedef SignalV2< void (GaussianBlurView source) > GaussianBlurViewSignal;
+ typedef Signal< void (GaussianBlurView source) > GaussianBlurViewSignal;
/**
* Create an uninitialized GaussianBlurView; this can be initialized with GaussianBlurView::New()
+++ /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__
public: /* Signals */
/// @brief Finished signal type.
- typedef SignalV2< void (MaskedImageView& source) > MaskedImageViewSignal;
+ typedef Signal< void (MaskedImageView& source) > MaskedImageViewSignal;
/**
* @brief Signal emitted when the render task which targets the
GetImpl( *this ).SetOrientationRotateAnimation( duration, alphaFunc );
}
-NavigationControl::ItemPushedSignalV2& NavigationControl::ItemPushedSignal()
+NavigationControl::ItemPushedSignalType& NavigationControl::ItemPushedSignal()
{
return GetImpl( *this ).ItemPushedSignal();
}
-NavigationControl::ItemPoppedSignalV2& NavigationControl::ItemPoppedSignal()
+NavigationControl::ItemPoppedSignalType& NavigationControl::ItemPoppedSignal()
{
return GetImpl( *this ).ItemPoppedSignal();
}
public: //Signal
- typedef SignalV2< void( NavigationControl, Page ) > ItemPushedSignalV2;
- typedef SignalV2< void( NavigationControl, Page ) > ItemPoppedSignalV2;
+ typedef Signal< void( NavigationControl, Page ) > ItemPushedSignalType;
+ typedef Signal< void( NavigationControl, Page ) > ItemPoppedSignalType;
/**
* Signal emitted right after a new item is pushed into the navigation stack.
* @endcode
* @return The signal to connect to.
*/
- ItemPushedSignalV2& ItemPushedSignal();
+ ItemPushedSignalType& ItemPushedSignal();
/**
* Signal emitted right after an item is popped out from the navigation stack.
* The app can use this signal and check the poppedItem to be uninitialized to know the app window should be lower
* @return The signal to connect to.
*/
- ItemPoppedSignalV2& ItemPoppedSignal();
+ ItemPoppedSignalType& ItemPoppedSignal();
/**
* Signal type for notification
*/
- typedef SignalV2< void ( int ) > RefreshSignal;
+ typedef Signal< void ( int ) > RefreshSignal;
/**
* Signal emitted when the Actor tree is ready for rendering into the page image.
public: //Signal
// Page Turned signal, with page index and boolean turning direction (true = forward, false = backward)
- typedef SignalV2< void ( PageTurnView, unsigned int, bool ) > PageTurnSignal;
- typedef SignalV2< void ( PageTurnView ) > PagePanSignal;
+ typedef Signal< void ( PageTurnView, unsigned int, bool ) > PageTurnSignal;
+ typedef Signal< void ( PageTurnView ) > PagePanSignal;
/**
* Signal emitted when a page has started to turn over.
// Signals
// Value changed
- typedef SignalV2< bool ( Slider, float ) > ValueChangedSignalType;
- typedef SignalV2< bool ( Slider, int ) > MarkSignalType;
+ typedef Signal< bool ( Slider, float ) > ValueChangedSignalType;
+ typedef Signal< bool ( Slider, int ) > MarkSignalType;
/**
* Signal emitted when the slider value changes
/**
* @brief Signal type for notifications.
*/
- typedef SignalV2< void (SuperBlurView source) > SuperBlurViewSignal;
+ typedef Signal< void (SuperBlurView source) > SuperBlurViewSignal;
/**
* @brief Creates an empty SuperBlurView handle.
GetImpl( *this ).SetAutoRotate( enabled );
}
-View::OrientationAnimationStartedSignalV2& View::OrientationAnimationStartedSignal()
+View::OrientationAnimationStartedSignalType& View::OrientationAnimationStartedSignal()
{
return GetImpl( *this ).OrientationAnimationStartedSignal();
}
public: //Signals
// Orientation change animation starts.
- typedef SignalV2< void ( View, Animation&, const Orientation& ) > OrientationAnimationStartedSignalV2;
+ typedef Signal< void ( View, Animation&, const Orientation& ) > OrientationAnimationStartedSignalType;
/**
* Signal emitted just before the rotate animation starts when the device orientation changes.
*/
- OrientationAnimationStartedSignalV2& OrientationAnimationStartedSignal();
+ OrientationAnimationStartedSignalType& OrientationAnimationStartedSignal();
public: // Not intended for application developers
const unsigned int TOOLKIT_MAJOR_VERSION = 1;
const unsigned int TOOLKIT_MINOR_VERSION = 0;
-const unsigned int TOOLKIT_MICRO_VERSION = 26;
+const unsigned int TOOLKIT_MICRO_VERSION = 28;
const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED
$(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/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 = \
GetImpl(*this).StopTransition();
}
-CubeTransitionEffect::TransitionCompletedSignalV2& CubeTransitionEffect::TransitionCompletedSignal()
+CubeTransitionEffect::TransitionCompletedSignalType& CubeTransitionEffect::TransitionCompletedSignal()
{
return GetImpl( *this ).TransitionCompletedSignal();
}
static const char* const SIGNAL_TRANSITION_COMPLETED;
//Transition animation completed signal
- typedef SignalV2< void ( CubeTransitionEffect, ImageActor ) > TransitionCompletedSignalV2;
+ typedef Signal< void ( CubeTransitionEffect, ImageActor ) > TransitionCompletedSignalType;
/**
* Signal emitted when the transition has completed animation
* @endcode
* @return The Signal to connect to.
*/
- TransitionCompletedSignalV2& TransitionCompletedSignal();
+ TransitionCompletedSignalType& TransitionCompletedSignal();
public: // Not intended for developer use
Name: dali-toolkit
Summary: The OpenGLES Canvas Core Library Toolkit
-Version: 1.0.26
+Version: 1.0.28
Release: 1
Group: System/Libraries
License: Apache-2.0
projects / platform / core / uifw / dali-toolkit.git / commitdiff
