projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed IsCandidate bug
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
focus-manager
/
focus-finder.cpp
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
(file)
--- 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<float> srcRect, Dali::Rect<float> destRect, D
{
\r
case Dali::Toolkit::Control::KeyboardFocus::LEFT:
\r
{
\r
{
\r
case Dali::Toolkit::Control::KeyboardFocus::LEFT:
\r
{
\r
- return (srcRect.right > destRect.right || srcRect.left >= destRect.right);
\r
+ return (srcRect.right > destRect.right || srcRect.left >= destRect.right)
&& srcRect.left > destRect.left
;
\r
}
\r
case Dali::Toolkit::Control::KeyboardFocus::RIGHT:
\r
{
\r
}
\r
case Dali::Toolkit::Control::KeyboardFocus::RIGHT:
\r
{
\r
- return (srcRect.left < destRect.left || srcRect.right <= destRect.left);
\r
+ return (srcRect.left < destRect.left || srcRect.right <= destRect.left)
&& srcRect.right < destRect.right
;
\r
}
\r
case Dali::Toolkit::Control::KeyboardFocus::UP:
\r
{
\r
}
\r
case Dali::Toolkit::Control::KeyboardFocus::UP:
\r
{
\r
- return (srcRect.bottom > destRect.bottom || srcRect.top >= destRect.bottom);
\r
+ return (srcRect.bottom > destRect.bottom || srcRect.top >= destRect.bottom)
&& srcRect.top > destRect.top
;
\r
}
\r
case Dali::Toolkit::Control::KeyboardFocus::DOWN:
\r
{
\r
}
\r
case Dali::Toolkit::Control::KeyboardFocus::DOWN:
\r
{
\r
- return (srcRect.top < destRect.top || srcRect.bottom <= destRect.top);
\r
+ return (srcRect.top < destRect.top || srcRect.bottom <= destRect.top)
&& srcRect.bottom < destRect.bottom
;
\r
}
\r
default:
\r
{
\r
}
\r
default:
\r
{
\r