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
Cursor fix.
[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
00c666e
..
4ce45eb
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/
dali-toolkit/internal/text/text-controller-impl.cpp
@@
-20,6
+20,7
@@
// EXTERNAL INCLUDES
#include <dali/public-api/adaptor-framework/key.h>
// EXTERNAL INCLUDES
#include <dali/public-api/adaptor-framework/key.h>
+#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/bidirectional-support.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/bidirectional-support.h>
@@
-35,6
+36,10
@@
namespace
{
namespace
{
+#if defined(DEBUG_ENABLED)
+ Debug::Filter* gLogFilter = Debug::Filter::New(Debug::Concise, true, "LOG_TEXT_CONTROLS");
+#endif
+
/**
* @brief Some characters can be shaped in more than one glyph.
* This struct is used to retrieve metrics from these group of glyphs.
/**
* @brief Some characters can be shaped in more than one glyph.
* This struct is used to retrieve metrics from these group of glyphs.
@@
-138,9
+143,11
@@
EventData::~EventData()
bool Controller::Impl::ProcessInputEvents()
{
bool Controller::Impl::ProcessInputEvents()
{
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::ProcessInputEvents\n" );
if( NULL == mEventData )
{
// Nothing to do if there is no text input.
if( NULL == mEventData )
{
// Nothing to do if there is no text input.
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::ProcessInputEvents no event data\n" );
return false;
}
return false;
}
@@
-235,6
+242,7
@@
bool Controller::Impl::ProcessInputEvents()
mEventData->mEventQueue.clear();
mEventData->mEventQueue.clear();
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::ProcessInputEvents\n" );
return mEventData->mDecoratorUpdated;
}
return mEventData->mDecoratorUpdated;
}
@@
-245,7
+253,7
@@
void Controller::Impl::UpdateModel( OperationsMask operationsRequired )
Vector<Character>& utf32Characters = mLogicalModel->mText;
Vector<Character>& utf32Characters = mLogicalModel->mText;
- const Length numberOfCharacters =
mLogicalModel->GetNumberOfCharacters
();
+ const Length numberOfCharacters =
utf32Characters.Count
();
Vector<LineBreakInfo>& lineBreakInfo = mLogicalModel->mLineBreakInfo;
if( GET_LINE_BREAKS & operations )
Vector<LineBreakInfo>& lineBreakInfo = mLogicalModel->mLineBreakInfo;
if( GET_LINE_BREAKS & operations )
@@
-1052,9
+1060,11
@@
CharacterIndex Controller::Impl::CalculateNewCursorIndex( CharacterIndex index )
void Controller::Impl::UpdateCursorPosition()
{
void Controller::Impl::UpdateCursorPosition()
{
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::UpdateCursorPosition %p\n", this );
if( NULL == mEventData )
{
// Nothing to do if there is no text input.
if( NULL == mEventData )
{
// Nothing to do if there is no text input.
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::UpdateCursorPosition no event data\n" );
return;
}
return;
}
@@
-1071,6
+1081,7
@@
void Controller::Impl::UpdateCursorPosition()
cursorPosition.y,
cursorInfo.primaryCursorHeight,
cursorInfo.lineHeight );
cursorPosition.y,
cursorInfo.primaryCursorHeight,
cursorInfo.lineHeight );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Primary cursor position: %f,%f\n", cursorPosition.x, cursorPosition.y );
// Sets the grab handle position.
mEventData->mDecorator->SetPosition( GRAB_HANDLE,
// Sets the grab handle position.
mEventData->mDecorator->SetPosition( GRAB_HANDLE,
@@
-1086,11
+1097,13
@@
void Controller::Impl::UpdateCursorPosition()
cursorInfo.secondaryPosition.y + offset.y,
cursorInfo.secondaryCursorHeight,
cursorInfo.lineHeight );
cursorInfo.secondaryPosition.y + offset.y,
cursorInfo.secondaryCursorHeight,
cursorInfo.lineHeight );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Secondary cursor position: %f,%f\n", cursorInfo.secondaryPosition.x + offset.x, cursorInfo.secondaryPosition.y + offset.y );
}
else
{
mEventData->mDecorator->SetActiveCursor( ACTIVE_CURSOR_PRIMARY );
}
}
else
{
mEventData->mDecorator->SetActiveCursor( ACTIVE_CURSOR_PRIMARY );
}
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::UpdateCursorPosition\n" );
}
void Controller::Impl::UpdateSelectionHandle( HandleType handleType )
}
void Controller::Impl::UpdateSelectionHandle( HandleType handleType )