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=313fee9850ee2f3d55bcf16637201172667d1315;hp=952c2615fe7b08fff1589322a68d37f9f7eab9c5;hb=5415aaa17c1f7e9c083957d8c705c8450a8ad84c;hpb=44009aa0dc79d54f7dcd484428e3248c98d9c56c

diff --git a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
index 952c261..313fee9 100644
--- a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
+++ b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
@@ -37,6 +37,8 @@ namespace FocusFinder
 {
 namespace
 {
+static constexpr float FULLY_TRANSPARENT(0.01f); ///< Alpha values must rise above this, before an object is considered to be visible.
+
 static int MajorAxisDistanceRaw(Dali::Toolkit::Control::KeyboardFocus::Direction direction, Dali::Rect<float> source, Dali::Rect<float> dest)
 {
   switch(direction)
@@ -340,6 +342,14 @@ bool IsBetterCandidate(Toolkit::Control::KeyboardFocus::Direction direction, Rec
                                                                                                MinorAxisDistance(direction, focusedRect, bestCandidateRect)));
 }
 
+bool IsFocusable(Actor& actor)
+{
+  return (actor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE) &&
+          actor.GetProperty<bool>(Actor::Property::VISIBLE) &&
+          actor.GetProperty<bool>(Actor::Property::SENSITIVE) &&
+          actor.GetProperty<Vector4>(Actor::Property::WORLD_COLOR).a > FULLY_TRANSPARENT);
+}
+
 Actor FindNextFocus(Actor& actor, Actor& focusedActor, Rect<float>& focusedRect, Rect<float>& bestCandidateRect, Toolkit::Control::KeyboardFocus::Direction direction)
 {
   Actor nearestActor;
@@ -350,7 +360,7 @@ Actor FindNextFocus(Actor& actor, Actor& focusedActor, Rect<float>& focusedRect,
     for(auto i = 0u; i < childCount; ++i)
     {
       Dali::Actor child = actor.GetChildAt(i);
-      if(child && child != focusedActor && child.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE))
+      if(child && child != focusedActor && IsFocusable(child))
       {
         Rect<float> candidateRect = DevelActor::CalculateScreenExtents(child);