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
It may be outside the range of type int.
[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
2fdf285
..
71934f0
100644
(file)
--- a/
dali-toolkit/devel-api/focus-manager/focus-finder.cpp
+++ b/
dali-toolkit/devel-api/focus-manager/focus-finder.cpp
@@
-152,9
+152,9
@@
static int MinorAxisDistance(Dali::Toolkit::Control::KeyboardFocus::Direction di
* @param minorAxisDistance The minorAxisDistance
\r
* @return The distance
\r
*/
\r
* @param minorAxisDistance The minorAxisDistance
\r
* @return The distance
\r
*/
\r
-static
in
t GetWeightedDistanceFor(int majorAxisDistance, int minorAxisDistance)
\r
+static
uint64_
t GetWeightedDistanceFor(int majorAxisDistance, int minorAxisDistance)
\r
{
\r
{
\r
- return 13 *
majorAxisDistance * majorAxisDistance + minorAxisDistance * minorAxisDistance
;
\r
+ return 13 *
static_cast<int64_t>(majorAxisDistance) * static_cast<int64_t>(majorAxisDistance) + static_cast<int64_t>(minorAxisDistance) * static_cast<int64_t>(minorAxisDistance)
;
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r