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
[3.0] Text - Fix for placement actor.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller-impl.cpp
diff --git
a/dali-toolkit/internal/text/text-controller-impl.cpp
b/dali-toolkit/internal/text/text-controller-impl.cpp
index
6d2a022
..
716a87d
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/
dali-toolkit/internal/text/text-controller-impl.cpp
@@
-1310,6
+1310,7
@@
void Controller::Impl::OnLongPressEvent( const Event& event )
{
ChangeState ( EventData::EDITING_WITH_POPUP );
mEventData->mDecoratorUpdated = true;
{
ChangeState ( EventData::EDITING_WITH_POPUP );
mEventData->mDecoratorUpdated = true;
+ mEventData->mUpdateInputStyle = true;
}
}
}
}
@@
-2666,13
+2667,13
@@
void Controller::Impl::UpdateSelectionHandle( HandleType handleType,
void Controller::Impl::ClampHorizontalScroll( const Vector2& layoutSize )
{
void Controller::Impl::ClampHorizontalScroll( const Vector2& layoutSize )
{
- // Clamp between -space &
0
.
+ // Clamp between -space &
-alignment offset
.
if( layoutSize.width > mVisualModel->mControlSize.width )
{
if( layoutSize.width > mVisualModel->mControlSize.width )
{
- const float space = ( layoutSize.width - mVisualModel->mControlSize.width );
+ const float space = ( layoutSize.width - mVisualModel->mControlSize.width )
+ mAlignmentOffset
;
mScrollPosition.x = ( mScrollPosition.x < -space ) ? -space : mScrollPosition.x;
mScrollPosition.x = ( mScrollPosition.x < -space ) ? -space : mScrollPosition.x;
- mScrollPosition.x = ( mScrollPosition.x >
0.f ) ? 0.f
: mScrollPosition.x;
+ mScrollPosition.x = ( mScrollPosition.x >
-mAlignmentOffset ) ? -mAlignmentOffset
: mScrollPosition.x;
mEventData->mDecoratorUpdated = true;
}
mEventData->mDecoratorUpdated = true;
}