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

diff --git a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
index c52bf57..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);
 }
@@ -385,12 +386,23 @@ Actor FindNextFocus(Actor& actor, Actor& focusedActor, Rect<float>& focusedRect,
 Actor GetNearestFocusableActor(Actor rootActor, Actor focusedActor, Toolkit::Control::KeyboardFocus::Direction direction)
 {
   Actor nearestActor;
-  if(!focusedActor || !rootActor)
+  if(!rootActor)
   {
     return nearestActor;
   }
 
-  Rect<float> focusedRect = DevelActor::CalculateScreenExtents(focusedActor);
+  Rect<float> focusedRect;
+  if (!focusedActor)
+  {
+    // If there is no currently focused actor, it is searched based on the upper left corner of the current window.
+    Rect<float> rootRect = DevelActor::CalculateScreenExtents(rootActor);
+    focusedRect = Rect<float>(rootRect.x, rootRect.y, 0.f, 0.f);
+  }
+  else
+  {
+    focusedRect = DevelActor::CalculateScreenExtents(focusedActor);
+  }
+
 
   // initialize the best candidate to something impossible
   // (so the first plausible actor will become the best choice)