X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fradio-button-impl.cpp;h=4b4e0708357cb7fcf31a4c428d1c7a3845081d8f;hp=aae430b8ac28e5f1fdcdc2253e743481066c4097;hb=f4b327350bf7873847f8f08bb27d11361f60f759;hpb=5a7e40bbe510ebaa434d496754f19b6a476918b7

diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
index aae430b..4b4e070 100644
--- a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
@@ -103,23 +103,27 @@ void RadioButton::OnStateChange(State newState)
       }
     }
   }
+
   // TODO: replace it with OnPropertySet hook once Button::Property::SELECTED will be consistently used
   if(Dali::Accessibility::IsUp() && (Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor() == Self())
      && (newState == SELECTED_STATE || newState == UNSELECTED_STATE))
   {
-    Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged(
-      Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0);
+    Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged(Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0);
   }
 }
 
 Dali::Accessibility::States RadioButton::AccessibleImpl::CalculateStates()
 {
-  auto tmp = Button::AccessibleImpl::CalculateStates();
-  auto slf = Toolkit::Button::DownCast(self);
-  if(slf.GetProperty<bool>(Toolkit::Button::Property::SELECTED))
-    tmp[Dali::Accessibility::State::CHECKED] = true;
-  tmp[Dali::Accessibility::State::SELECTABLE] = true;
-  return tmp;
+  auto state = Button::AccessibleImpl::CalculateStates();
+  auto self = Toolkit::Button::DownCast(Self());
+
+  if(self.GetProperty<bool>(Toolkit::Button::Property::SELECTED))
+  {
+    state[Dali::Accessibility::State::CHECKED] = true;
+  }
+
+  state[Dali::Accessibility::State::SELECTABLE] = true;
+  return state;
 }
 
 } // namespace Internal