Merge "FocusFinder use CalculateCurrentScreenExtents" into devel/master

diff --git a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
index 71934f0..c007888 100644 (file)
--- a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
+++ b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
@@ -360,7 +360,7 @@ Actor FindNextFocus(Actor& actor, Actor& focusedActor, Rect<float>& focusedRect,
       Dali::Actor child = actor.GetChildAt(i-1);\r
       if(child && child != focusedActor && IsFocusable(child))\r
       {\r
-        Rect<float> candidateRect = DevelActor::CalculateScreenExtents(child);\r
+        Rect<float> candidateRect = DevelActor::CalculateCurrentScreenExtents(child);\r
 \r
         // convert x, y, width, height -> left, right, bottom, top\r
         ConvertCoordinate(candidateRect);\r
@@ -395,12 +395,12 @@ Actor GetNearestFocusableActor(Actor rootActor, Actor focusedActor, Toolkit::Con
   if (!focusedActor)\r
   {\r
     // If there is no currently focused actor, it is searched based on the upper left corner of the current window.\r
-    Rect<float> rootRect = DevelActor::CalculateScreenExtents(rootActor);\r
+    Rect<float> rootRect = DevelActor::CalculateCurrentScreenExtents(rootActor);\r
     focusedRect = Rect<float>(rootRect.x, rootRect.y, 0.f, 0.f);\r
   }\r
   else\r
   {\r
-    focusedRect = DevelActor::CalculateScreenExtents(focusedActor);\r
+    focusedRect = DevelActor::CalculateCurrentScreenExtents(focusedActor);\r
   }\r
 \r
 \r