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
Merge "Merge branch 'devel/master(1.2.18)' into tizen" into tizen
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
item-view
/
depth-layout.cpp
diff --git
a/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp
b/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp
index
34838ad
..
613af0a
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp
+++ b/
dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-390,7
+390,7
@@
float DepthLayout::GetClosestAnchorPosition(float layoutPosition) const
float DepthLayout::GetItemScrollToPosition(unsigned int itemId) const
{
float DepthLayout::GetItemScrollToPosition(unsigned int itemId) const
{
- float rowIndex = static_cast<
float>(itemId / mImpl->mNumberOfColumns)
;
+ float rowIndex = static_cast<
float >( itemId ) / mImpl->mNumberOfColumns
;
return -rowIndex * static_cast<float>(mImpl->mNumberOfColumns);
}
return -rowIndex * static_cast<float>(mImpl->mNumberOfColumns);
}
@@
-418,14
+418,6
@@
void DepthLayout::GetDefaultItemSize( unsigned int itemId, const Vector3& layout
itemSize.width = itemSize.height = itemSize.depth = ( IsVertical( GetOrientation() ) ? layoutSize.width : layoutSize.height ) / static_cast<float>( mImpl->mNumberOfColumns + 1 );
}
itemSize.width = itemSize.height = itemSize.depth = ( IsVertical( GetOrientation() ) ? layoutSize.width : layoutSize.height ) / static_cast<float>( mImpl->mNumberOfColumns + 1 );
}
-void DepthLayout::GetResizeAnimation(Animation& animation, Actor actor, Vector3 size, float durationSeconds) const
-{
- if(animation)
- {
- animation.AnimateTo( Property( actor, Actor::Property::SIZE ), size );
- }
-}
-
Degree DepthLayout::GetScrollDirection() const
{
Degree scrollDirection(0.0f);
Degree DepthLayout::GetScrollDirection() const
{
Degree scrollDirection(0.0f);
@@
-567,11
+559,11
@@
float DepthLayout::GetClosestOnScreenLayoutPosition(int itemID, float currentLay
return scrollTo;
}
return scrollTo;
}
-int DepthLayout::GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocus
Navigation
Direction direction, bool loopEnabled)
+int DepthLayout::GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocus
::
Direction direction, bool loopEnabled)
{
switch( direction )
{
{
switch( direction )
{
- case Toolkit::Control::
Left
:
+ case Toolkit::Control::
KeyboardFocus::LEFT
:
{
itemID--;
if( itemID < 0 )
{
itemID--;
if( itemID < 0 )
@@
-580,7
+572,7
@@
int DepthLayout::GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Con
}
break;
}
}
break;
}
- case Toolkit::Control::
Up
:
+ case Toolkit::Control::
KeyboardFocus::UP
:
{
itemID += mImpl->mNumberOfColumns;
if( itemID >= maxItems )
{
itemID += mImpl->mNumberOfColumns;
if( itemID >= maxItems )
@@
-589,7
+581,7
@@
int DepthLayout::GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Con
}
break;
}
}
break;
}
- case Toolkit::Control::
Right
:
+ case Toolkit::Control::
KeyboardFocus::RIGHT
:
{
itemID++;
if( itemID >= maxItems )
{
itemID++;
if( itemID >= maxItems )
@@
-598,7
+590,7
@@
int DepthLayout::GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Con
}
break;
}
}
break;
}
- case Toolkit::Control::
Down
:
+ case Toolkit::Control::
KeyboardFocus::DOWN
:
{
itemID -= mImpl->mNumberOfColumns;
if( itemID < 0 )
{
itemID -= mImpl->mNumberOfColumns;
if( itemID < 0 )