From 2f482eb2a0f44c6ed5ef60edf627b597203e6d6b Mon Sep 17 00:00:00 2001 From: "joogab.yun" Date: Sat, 7 Aug 2021 00:54:27 +0900 Subject: [PATCH] Fixed IsCandidate bug Change-Id: Ibaa8a6412f28acf60011173487123f0d9dc6ec08 --- dali-toolkit/devel-api/focus-manager/focus-finder.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp index a7324b8..0cf66cd 100644 --- a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp +++ b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp @@ -188,19 +188,19 @@ static bool IsCandidate(Dali::Rect srcRect, Dali::Rect destRect, D { case Dali::Toolkit::Control::KeyboardFocus::LEFT: { - return (srcRect.right > destRect.right || srcRect.left >= destRect.right); + return (srcRect.right > destRect.right || srcRect.left >= destRect.right) && srcRect.left > destRect.left; } case Dali::Toolkit::Control::KeyboardFocus::RIGHT: { - return (srcRect.left < destRect.left || srcRect.right <= destRect.left); + return (srcRect.left < destRect.left || srcRect.right <= destRect.left) && srcRect.right < destRect.right; } case Dali::Toolkit::Control::KeyboardFocus::UP: { - return (srcRect.bottom > destRect.bottom || srcRect.top >= destRect.bottom); + return (srcRect.bottom > destRect.bottom || srcRect.top >= destRect.bottom) && srcRect.top > destRect.top; } case Dali::Toolkit::Control::KeyboardFocus::DOWN: { - return (srcRect.top < destRect.top || srcRect.bottom <= destRect.top); + return (srcRect.top < destRect.top || srcRect.bottom <= destRect.top) && srcRect.bottom < destRect.bottom; } default: { -- 2.7.4