X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Ffocus-manager%2Ffocus-finder.cpp;h=71934f09408d26255ccc5a87c6901137ae58896e;hp=d338e39b3341b1704e98bef02b56b914d7343ea0;hb=cb2229846d61445fdaff58fd5521dc3fb36e7676;hpb=340a0bbd8c7e93bc7a8e7c25b7ff44bb0b0af196

diff --git a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
index d338e39..71934f0 100644
--- a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
+++ b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
@@ -152,9 +152,9 @@ static int MinorAxisDistance(Dali::Toolkit::Control::KeyboardFocus::Direction di
  * @param minorAxisDistance The minorAxisDistance
  * @return The distance
  */
-static int GetWeightedDistanceFor(int majorAxisDistance, int minorAxisDistance)
+static uint64_t GetWeightedDistanceFor(int majorAxisDistance, int minorAxisDistance)
 {
-  return 13 * majorAxisDistance * majorAxisDistance + minorAxisDistance * minorAxisDistance;
+  return 13 * static_cast<int64_t>(majorAxisDistance) * static_cast<int64_t>(majorAxisDistance) + static_cast<int64_t>(minorAxisDistance) * static_cast<int64_t>(minorAxisDistance);
 }
 
 /**
@@ -343,6 +343,7 @@ bool IsBetterCandidate(Toolkit::Control::KeyboardFocus::Direction direction, Rec
 bool IsFocusable(Actor& actor)
 {
   return (actor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE) &&
+          actor.GetProperty<bool>(DevelActor::Property::USER_INTERACTION_ENABLED) &&
           actor.GetProperty<bool>(Actor::Property::VISIBLE) &&
           actor.GetProperty<Vector4>(Actor::Property::WORLD_COLOR).a > FULLY_TRANSPARENT);
 }