From: Eunki Hong Date: Mon, 15 May 2023 15:14:48 +0000 (+0900) Subject: FocusFinder use CalculateCurrentScreenExtents X-Git-Tag: dali_2.2.32~3^2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=4ef78b42c3d571c2331e95b53303677539d34a69 FocusFinder use CalculateCurrentScreenExtents Let we use CalculateCurrentScreenExtents instead of CalculateScreenExtents during find next focusable actor. Since CalculateScreenExtents is heavy job, we'd better use CalculateCurrentScreenExtents, what we were used until now. Change-Id: Ic59f23869c549457ce622899876cef178dabb63b Signed-off-by: Eunki Hong --- 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 --- 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& focusedRect, Dali::Actor child = actor.GetChildAt(i-1); if(child && child != focusedActor && IsFocusable(child)) { - Rect candidateRect = DevelActor::CalculateScreenExtents(child); + Rect candidateRect = DevelActor::CalculateCurrentScreenExtents(child); // convert x, y, width, height -> left, right, bottom, top ConvertCoordinate(candidateRect); @@ -395,12 +395,12 @@ Actor GetNearestFocusableActor(Actor rootActor, Actor focusedActor, Toolkit::Con if (!focusedActor) { // If there is no currently focused actor, it is searched based on the upper left corner of the current window. - Rect rootRect = DevelActor::CalculateScreenExtents(rootActor); + Rect rootRect = DevelActor::CalculateCurrentScreenExtents(rootActor); focusedRect = Rect(rootRect.x, rootRect.y, 0.f, 0.f); } else { - focusedRect = DevelActor::CalculateScreenExtents(focusedActor); + focusedRect = DevelActor::CalculateCurrentScreenExtents(focusedActor); }