X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fbutton-impl.cpp;h=148484d3931ce071accece5a52c97d81525056b7;hp=61a57058525a829d495075269638efc4fea54c2e;hb=2bb866335dd821778de0b7245b6d04c814f82efc;hpb=abbf60ed35112186269d2fe93b949eb8abd4283d

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 61a5705..148484d 100644
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -519,7 +519,7 @@ void Button::ButtonUp()
 
     if( mTogglableButton ) // Button up will change state
     {
-      OnToggleReleased(); // Derived toggle buttons can override this to provide custom behaviour
+      validButtonAction = OnToggleReleased(); // Derived toggle buttons can override this to provide custom behaviour
     }
     else
     {
@@ -826,6 +826,8 @@ void Button::OnRelayout( const Vector2& size, RelayoutContainer& container )
 {
   DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout targetSize(%f,%f) ptr(%p) state[%d]\n", size.width, size.height, this, mButtonState );
 
+  PerformFunctionOnVisualsInState( &Button::SelectRequiredVisual, mButtonState );
+
   Toolkit::Visual::Base currentVisual = GetVisual( GET_VISUAL_INDEX_FOR_STATE[mButtonState][FOREGROUND] );
 
   Toolkit::Visual::Base currentBackGroundVisual = GetVisual( GET_VISUAL_INDEX_FOR_STATE[mButtonState][BACKGROUND] );
@@ -1339,13 +1341,13 @@ const Vector4 Button::GetSelectedColor() const
 
 void Button::SetAnimationTime( float animationTime )
 {
-  // Used by depreciated API
+  // Used by deprecated API
   mAnimationTime = animationTime;
 }
 
 float Button::GetAnimationTime() const
 {
-  // Used by depreciated API
+  // Used by deprecated API
   return mAnimationTime;
 }
 
@@ -1416,7 +1418,7 @@ void Button::SetDisabledSelectedImage( const std::string& filename )
   }
 }
 
-std::string Button::GetUrlForImageVisual( Property::Index index )
+std::string Button::GetUrlForImageVisual( const Property::Index index ) const
 {
   Toolkit::Visual::Base visual = GetVisual( index );
   std::string result;
@@ -1437,16 +1439,50 @@ std::string Button::GetUrlForImageVisual( Property::Index index )
 
 // Below functions DEPRECATED_1_0.50 - Return empty Actors
 
+namespace
+{
+std::string GetUrlFromImage( Image& image )
+{
+  ResourceImage resourceImage = ResourceImage::DownCast( image );
+
+  std::string imageUrl;
+
+  if ( resourceImage )
+  {
+    imageUrl = resourceImage.GetUrl();
+  }
+  return imageUrl;
+}
+
+} // namespace
+
+
+void Button::SetButtonImage( Image image )
+{
+  DALI_LOG_WARNING("Button::SetButtonImage @DEPRECATED_1_0.50\n");
+  SetUnselectedImage( GetUrlFromImage( image ) );
+}
+
+void Button::SetSelectedImage( Image image )
+{
+  DALI_LOG_WARNING("Button::SetSelectedImage @DEPRECATED_1_0.50\n");
+  SetSelectedImage( GetUrlFromImage( image ) );
+}
+
 Actor Button::GetButtonImage() const
 {
-  DALI_LOG_WARNING("Button::GetButtonImage @DEPRECATED_1_0.50 Returning empty Actor \n");
-  return Actor();;
+  DALI_LOG_WARNING("Button::GetButtonImage @DEPRECATED_1_0.50\n");
+  Actor imageView = Toolkit::ImageView::New( GetUrlForImageVisual( Toolkit::Button::Property::UNSELECTED_VISUAL ) );
+
+  return imageView;
 }
 
 Actor Button::GetSelectedImage() const
 {
-  DALI_LOG_WARNING("Button::GetSelectedImage @DEPRECATED_1_0.50 Returning empty Actor \n");
-  return Actor();
+  DALI_LOG_WARNING("Button::GetSelectedImage @DEPRECATED_1_0.50\n");
+  Actor imageView = Toolkit::ImageView::New( GetUrlForImageVisual( Toolkit::Button::Property::SELECTED_VISUAL ) );
+
+  return imageView;
 }
 
 } // namespace Internal