X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fpush-button-impl.cpp;h=1a5c3a435e5acc64ea2830b7509074c3d5376352;hp=c96d56d4bf215b7fe0313bed342b0e1f262c4683;hb=c38b9091faab34444644f626356abbdb875548d8;hpb=834ddf7832598a57fc18c282371554a1ed8f0a78 diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp index c96d56d..1a5c3a4 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp @@ -23,7 +23,7 @@ #include // INTERNAL INCLUDES -#include +#include namespace Dali { @@ -1074,19 +1074,19 @@ Vector3 PushButton::GetNaturalSize() } // If label, test against it's size - Toolkit::TextView textView = Toolkit::TextView::DownCast( GetLabel() ); - if( textView ) + Toolkit::TextLabel textLabel = Toolkit::TextLabel::DownCast( GetLabel() ); + if( textLabel ) { - Vector3 textViewSize = textView.GetNaturalSize(); + Vector3 textLabelSize = textLabel.GetNaturalSize(); if( widthIsZero ) { - size.width = std::max( size.width, textViewSize.width + TEXT_PADDING * 2.0f ); + size.width = std::max( size.width, textLabelSize.width + TEXT_PADDING * 2.0f ); } if( heightIsZero ) { - size.height = std::max( size.height, textViewSize.height + TEXT_PADDING * 2.0f ); + size.height = std::max( size.height, textLabelSize.height + TEXT_PADDING * 2.0f ); } } }