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 "Do not reposition the text's popup when buttons are pressed." into devel/master
[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
cff37b1
..
bd66860
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/
dali-toolkit/internal/text/text-controller-impl.cpp
@@
-33,7
+33,7
@@
namespace
{
#if defined(DEBUG_ENABLED)
{
#if defined(DEBUG_ENABLED)
- Debug::Filter* gLogFilter = Debug::Filter::New(Debug::
Concise
, true, "LOG_TEXT_CONTROLS");
+ Debug::Filter* gLogFilter = Debug::Filter::New(Debug::
NoLogging
, true, "LOG_TEXT_CONTROLS");
#endif
/**
#endif
/**
@@
-277,6
+277,8
@@
bool Controller::Impl::ProcessInputEvents()
void Controller::Impl::UpdateModel( OperationsMask operationsRequired )
{
void Controller::Impl::UpdateModel( OperationsMask operationsRequired )
{
+ DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::UpdateModel\n" );
+
// Calculate the operations to be done.
const OperationsMask operations = static_cast<OperationsMask>( mOperationsPending & operationsRequired );
// Calculate the operations to be done.
const OperationsMask operations = static_cast<OperationsMask>( mOperationsPending & operationsRequired );
@@
-461,6
+463,7
@@
void Controller::Impl::GetDefaultFonts( Vector<FontRun>& fonts, Length numberOfC
{
if( mFontDefaults )
{
{
if( mFontDefaults )
{
+ DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::GetDefaultFonts font family(%s)\n", mFontDefaults->mFontDescription.family.c_str() );
FontRun fontRun;
fontRun.characterRun.characterIndex = 0;
fontRun.characterRun.numberOfCharacters = numberOfCharacters;
FontRun fontRun;
fontRun.characterRun.characterIndex = 0;
fontRun.characterRun.numberOfCharacters = numberOfCharacters;
@@
-1524,7
+1527,7
@@
void Controller::Impl::GetCursorPosition( CharacterIndex logical,
cursorInfo.lineHeight = GetDefaultFontLineHeight();
cursorInfo.primaryCursorHeight = cursorInfo.lineHeight;
cursorInfo.lineHeight = GetDefaultFontLineHeight();
cursorInfo.primaryCursorHeight = cursorInfo.lineHeight;
- cursorInfo.primaryPosition.x =
mEventData->mDecorator->GetCursorWidth()
;
+ cursorInfo.primaryPosition.x =
0.f
;
cursorInfo.primaryPosition.y = 0.f;
// Nothing else to do.
cursorInfo.primaryPosition.y = 0.f;
// Nothing else to do.
@@
-1793,7
+1796,7
@@
void Controller::Impl::UpdateCursorPosition()
{
case LayoutEngine::HORIZONTAL_ALIGN_BEGIN:
{
{
case LayoutEngine::HORIZONTAL_ALIGN_BEGIN:
{
- cursorPosition.x =
mEventData->mDecorator->GetCursorWidth()
;
+ cursorPosition.x =
0.f
;
break;
}
case LayoutEngine::HORIZONTAL_ALIGN_CENTER:
break;
}
case LayoutEngine::HORIZONTAL_ALIGN_CENTER:
@@
-1803,7
+1806,7
@@
void Controller::Impl::UpdateCursorPosition()
}
case LayoutEngine::HORIZONTAL_ALIGN_END:
{
}
case LayoutEngine::HORIZONTAL_ALIGN_END:
{
- cursorPosition.x = mVisualModel->mControlSize.width;
+ cursorPosition.x = mVisualModel->mControlSize.width
- mEventData->mDecorator->GetCursorWidth()
;
break;
}
}
break;
}
}