Removed OnButton virtual functions and simplified RadioButton logic

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / buttons / check-box-button-impl.cpp

diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
index b1f7474..9554ccb 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -19,12 +19,19 @@
 #include "check-box-button-impl.h"
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/actors/image-actor.h>
+#include <dali/integration-api/debug.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/images/resource-image.h>
 
 //INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/image-view/image-view-impl.h>
+#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
 #include <dali-toolkit/devel-api/shader-effects/image-region-effect.h>
+#include <dali-toolkit/devel-api/shader-effects/image-region-effect.h>
+
+#if defined(DEBUG_ENABLED)
+  extern Debug::Filter* gLogButtonFilter;
+#endif
 
 namespace Dali
 {
@@ -38,9 +45,6 @@ namespace Internal
 namespace
 {
 
-const float DISTANCE_BETWEEN_IMAGE_AND_LABEL( 5.0f );
-const float ANIMATION_TIME( 0.26f );  // EFL checkbox tick time
-
 BaseHandle Create()
 {
   return Toolkit::CheckBoxButton::New();
@@ -48,10 +52,8 @@ BaseHandle Create()
 
 TypeRegistration mType( typeid(Toolkit::CheckBoxButton), typeid(Toolkit::Button), Create );
 
-const char* const UNSELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "checkbox-unselected.png";
-const char* const SELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "checkbox-selected.png";
-const char* const DISABLED_UNSELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "checkbox-unselected-disabled.png";
-const char* const DISABLED_SELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "checkbox-selected-diabled.png";
+
+
 }
 
 Dali::Toolkit::CheckBoxButton CheckBoxButton::New()
@@ -73,166 +75,17 @@ CheckBoxButton::CheckBoxButton()
 : Button()
 {
   SetTogglableButton( true );
-
-  SetAnimationTime( ANIMATION_TIME );
 }
 
 CheckBoxButton::~CheckBoxButton()
 {
 }
 
-void CheckBoxButton::OnButtonInitialize()
-{
-  // Wrap around all children
-  Self().SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
-
-  Image buttonImage = Dali::ResourceImage::New( UNSELECTED_BUTTON_IMAGE_DIR, ResourceImage::ON_DEMAND, ResourceImage::NEVER );
-  Image selectedImage = Dali::ResourceImage::New( SELECTED_BUTTON_IMAGE_DIR, ResourceImage::ON_DEMAND, ResourceImage::NEVER );
-  Image disabledImage = Dali::ResourceImage::New( DISABLED_UNSELECTED_BUTTON_IMAGE_DIR, ResourceImage::ON_DEMAND, ResourceImage::NEVER );
-  Image disabledSelectedImage = Dali::ResourceImage::New( DISABLED_SELECTED_BUTTON_IMAGE_DIR, ResourceImage::ON_DEMAND, ResourceImage::NEVER );
-
-  SetButtonImage( ImageActor::New( buttonImage ) );
-  SetSelectedImage( ImageActor::New( selectedImage ) );
-  SetDisabledImage( ImageActor::New( disabledImage ) );
-  SetDisabledSelectedImage( ImageActor::New( disabledSelectedImage ) );
-}
-
-void CheckBoxButton::OnLabelSet()
-{
-  Actor& label = GetLabel();
-
-  if( label )
-  {
-    label.SetParentOrigin( ParentOrigin::CENTER_LEFT );
-    label.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
-
-    if( IsDisabled() && GetDisabledBackgroundImage() )
-    {
-      label.SetX( GetDisabledBackgroundImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
-    }
-    else if ( GetBackgroundImage() )
-    {
-      label.SetX( GetBackgroundImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
-    }
-    else if( IsSelected() && GetSelectedImage())
-    {
-      label.SetX( GetSelectedImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
-    }
-    else if( GetButtonImage() )
-    {
-      label.SetX( GetButtonImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
-    }
-    else
-    {
-      label.SetX( DISTANCE_BETWEEN_IMAGE_AND_LABEL );
-    }
-  }
-}
-
-void CheckBoxButton::OnDisabled()
-{
-  Actor& backgroundImage = GetBackgroundImage();
-  Actor& disabledBackgroundImage = GetDisabledBackgroundImage();
-
-  Actor& label = GetLabel();
-  if( label )
-  {
-    if( IsDisabled() && disabledBackgroundImage )
-    {
-      label.SetX( disabledBackgroundImage.GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
-    }
-    else if( backgroundImage )
-    {
-      label.SetX( backgroundImage.GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
-    }
-    else if( IsSelected() && GetSelectedImage())
-    {
-      label.SetX( GetSelectedImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
-    }
-    else if( GetButtonImage() )
-    {
-      label.SetX( GetButtonImage().GetNaturalSize().width + DISTANCE_BETWEEN_IMAGE_AND_LABEL );
-    }
-    else
-    {
-      label.SetX( DISTANCE_BETWEEN_IMAGE_AND_LABEL );
-    }
-  }
-}
-
-void CheckBoxButton::PrepareForTranstionIn( Actor actor )
+void CheckBoxButton::OnInitialize()
 {
-  Actor& selectedImage = GetSelectedImage();
-  if( actor == selectedImage )
-  {
-    actor.SetScale( Vector3( 0.0f, 1.0f, 1.0f ) );
-
-    if( !mTickUVEffect )
-    {
-      mTickUVEffect = CreateImageRegionEffect();
-    }
-    mTickUVEffect.SetUniform("uBottomRight", Vector2( 0.0f, 1.0f ) );
-
-    ImageActor imageActor = ImageActor::DownCast( actor );
-    if( imageActor )
-    {
-      imageActor.SetShaderEffect( mTickUVEffect );
-    }
-  }
+  Button::OnInitialize();
 }
 
-void CheckBoxButton::PrepareForTranstionOut( Actor actor )
-{
-  Actor& selectedImage = GetSelectedImage();
-  if( actor == selectedImage )
-  {
-    actor.SetScale( Vector3::ONE );
-
-    if( !mTickUVEffect )
-    {
-        mTickUVEffect = CreateImageRegionEffect();
-    }
-    mTickUVEffect.SetUniform("uBottomRight", Vector2::ONE );
-
-    ImageActor imageActor = ImageActor::DownCast( actor );
-    if( imageActor )
-    {
-      imageActor.SetShaderEffect( mTickUVEffect );
-    }
-  }
-}
-
-void CheckBoxButton::OnTransitionIn( Actor actor )
-{
-  Actor& selectedImage = GetSelectedImage();
-  if( actor && actor == selectedImage )
-  {
-    if( GetPaintState() == UnselectedState )
-    {
-      Dali::Animation transitionAnimation = GetTransitionAnimation();
-      if( transitionAnimation )
-      {
-        DALI_ASSERT_DEBUG( mTickUVEffect );
-        if( mTickUVEffect )
-        {
-          // UV anim
-          transitionAnimation.AnimateTo( Property( mTickUVEffect, "uBottomRight" ), Vector2::ONE );
-        }
-        // Actor size anim
-        transitionAnimation.AnimateTo( Property( actor, Actor::Property::SCALE_X ), 1.0f );
-      }
-    }
-    else
-    {
-      //explicitly end the swipe animation
-      actor.SetScale( Vector3::ONE );
-      if( mTickUVEffect )
-      {
-       mTickUVEffect.SetUniform("uBottomRight", Vector2::ONE );
-      }
-    }
-  }
-}
 
 } // namespace Internal