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 "Fixed IsCandidate bug" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller.cpp
diff --git
a/dali-toolkit/internal/text/text-controller.cpp
b/dali-toolkit/internal/text/text-controller.cpp
index
7e0410d
..
dce67ff
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller.cpp
+++ b/
dali-toolkit/internal/text/text-controller.cpp
@@
-1822,6
+1822,11
@@
void Controller::SelectEvent(float x, float y, SelectionType selectType)
EventHandler::SelectEvent(*this, x, y, selectType);
}
EventHandler::SelectEvent(*this, x, y, selectType);
}
+void Controller::SelectEvent(const uint32_t start, const uint32_t end, SelectionType selectType)
+{
+ EventHandler::SelectEvent(*this, start, end, selectType);
+}
+
void Controller::SetTextSelectionRange(const uint32_t* start, const uint32_t* end)
{
if(mImpl->mEventData)
void Controller::SetTextSelectionRange(const uint32_t* start, const uint32_t* end)
{
if(mImpl->mEventData)
@@
-1845,7
+1850,7
@@
CharacterIndex Controller::GetPrimaryCursorPosition() const
return mImpl->GetPrimaryCursorPosition();
}
return mImpl->GetPrimaryCursorPosition();
}
-bool Controller::SetPrimaryCursorPosition(CharacterIndex index)
+bool Controller::SetPrimaryCursorPosition(CharacterIndex index
, bool focused
)
{
if(mImpl->mEventData)
{
{
if(mImpl->mEventData)
{
@@
-1853,7
+1858,7
@@
bool Controller::SetPrimaryCursorPosition(CharacterIndex index)
mImpl->mEventData->mIsLeftHandleSelected = true;
mImpl->mEventData->mIsRightHandleSelected = true;
mImpl->mEventData->mCheckScrollAmount = true;
mImpl->mEventData->mIsLeftHandleSelected = true;
mImpl->mEventData->mIsRightHandleSelected = true;
mImpl->mEventData->mCheckScrollAmount = true;
- if(mImpl->SetPrimaryCursorPosition(index
)
)
+ if(mImpl->SetPrimaryCursorPosition(index
, focused) && focused
)
{
KeyboardFocusGainEvent();
return true;
{
KeyboardFocusGainEvent();
return true;
@@
-1872,6
+1877,11
@@
void Controller::SelectNone()
SelectEvent(0.f, 0.f, SelectionType::NONE);
}
SelectEvent(0.f, 0.f, SelectionType::NONE);
}
+void Controller::SelectText(const uint32_t start, const uint32_t end)
+{
+ SelectEvent(start, end, SelectionType::RANGE);
+}
+
string Controller::GetSelectedText() const
{
string text;
string Controller::GetSelectedText() const
{
string text;