(Buttons) Fix build break for automated tests & remove unused function

Change-Id: Ib149b289fe93425f888598247f17f4415aac47d8

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp
index 6852258..9885e19 100644 (file)
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp
@@ -700,7 +700,7 @@ int UtcDaliPushButtonProperties(void)
 
   //  Button::PROPERTY_DISABLED_STATE_ACTOR
   {
-    button.SetDimmedImage( Image::New( "IMAGE_PATH_3") );
+    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;

diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp
index e566cbd..a3a3812 100644 (file)
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp
+++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-Button.cpp
@@ -105,11 +105,11 @@ int UtcDaliButtonProperties(void)
   PushButton pushButton = PushButton::New();
 
   //Test various properties
-  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("dimmed"), false );
-  DALI_TEST_CHECK( false == checkBoxButton.IsDimmed() );
+  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("disabled"), false );
+  DALI_TEST_CHECK( false == checkBoxButton.IsDisabled() );
 
-  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("dimmed"), true );
-  DALI_TEST_CHECK( true == checkBoxButton.IsDimmed() );
+  checkBoxButton.SetProperty( checkBoxButton.GetPropertyIndex("disabled"), true );
+  DALI_TEST_CHECK( true == checkBoxButton.IsDisabled() );
   END_TEST;
 }
 
@@ -119,17 +119,17 @@ int UtcDaliButtonSetGetDimmed(void)
   tet_infoline(" UtcDaliButtonSetGetDimmed");
 
   CheckBoxButton checkBoxButton = CheckBoxButton::New();
-  checkBoxButton.SetDimmed( true );
+  checkBoxButton.SetDisabled( true );
 
-  DALI_TEST_CHECK( checkBoxButton.IsDimmed() );
-  checkBoxButton.SetDimmed( false );
+  DALI_TEST_CHECK( checkBoxButton.IsDisabled() );
+  checkBoxButton.SetDisabled( false );
 
-  DALI_TEST_CHECK( !checkBoxButton.IsDimmed() );
-  checkBoxButton.SetDimmed( true );
+  DALI_TEST_CHECK( !checkBoxButton.IsDisabled() );
+  checkBoxButton.SetDisabled( true );
 
-  DALI_TEST_CHECK( checkBoxButton.IsDimmed() );
-  checkBoxButton.SetDimmed( false );
+  DALI_TEST_CHECK( checkBoxButton.IsDisabled() );
+  checkBoxButton.SetDisabled( false );
 
-  DALI_TEST_CHECK( !checkBoxButton.IsDimmed() );
+  DALI_TEST_CHECK( !checkBoxButton.IsDisabled() );
   END_TEST;
 }

diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CheckBoxButton.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CheckBoxButton.cpp
index 5625c92..f016900 100644 (file)
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CheckBoxButton.cpp
+++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CheckBoxButton.cpp
@@ -168,42 +168,42 @@ int UtcDaliCheckBoxButtonSetImages(void)
   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 );

diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-RadioButton.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-RadioButton.cpp
index fd7d3a1..66bb90d 100644 (file)
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-RadioButton.cpp
+++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-RadioButton.cpp
@@ -124,27 +124,27 @@ int UtcDaliRadioButtonActive(void)
   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;
 }

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
index b0dd81d..69948df 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
@@ -96,10 +96,10 @@ int UtcDaliButtonSetProperty(void)
 
   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;
 }
 
@@ -110,21 +110,21 @@ int UtcDaliButtonSetGetDimmed(void)
 
   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;
 }
 

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
index 809d711..2f0b7fc 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
@@ -366,42 +366,42 @@ int UtcDaliPushButtonSetImages(void)
   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 );

diff --git a/base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp b/base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp
index 53646cd..3885f5f 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp
@@ -42,23 +42,6 @@ const float BACKGROUND_DEPTH( 0.25f );
 
 const float ANIMATION_TIME( 0.26f );  // EFL checkbox tick time
 
-/**
- * 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 );