X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.cpp;h=9cefc6c0f1e4a586790a42f3c4f369ed5f8c9fcd;hp=2f4ef60957a53b7e82fcf2281dbc4beca915a78a;hb=6d3a21eaeaae4edbc04b6e902b61439cdf029188;hpb=43255aba62db53f6a8f042687687141fb9de8aa1 diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp index 2f4ef60..9cefc6c 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -204,8 +204,8 @@ Toolkit::TextField::InputStyle::Mask ConvertInputStyle(Text::InputStyle::Mask in bool IsHiddenInput(Toolkit::TextField textField) { Property::Map hiddenInputSettings = textField.GetProperty(Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS); - auto mode = hiddenInputSettings.Find(Toolkit::HiddenInput::Property::MODE); - if (mode && (mode->Get() != Toolkit::HiddenInput::Mode::HIDE_NONE)) + auto mode = hiddenInputSettings.Find(Toolkit::HiddenInput::Property::MODE); + if(mode && (mode->Get() != Toolkit::HiddenInput::Mode::HIDE_NONE)) { return true; } @@ -215,8 +215,8 @@ bool IsHiddenInput(Toolkit::TextField textField) char GetSubstituteCharacter(Toolkit::TextField textField) { Property::Map hiddenInputSettings = textField.GetProperty(Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS); - auto substChar = hiddenInputSettings.Find(Toolkit::HiddenInput::Property::SUBSTITUTE_CHARACTER); - if (substChar) + auto substChar = hiddenInputSettings.Find(Toolkit::HiddenInput::Property::SUBSTITUTE_CHARACTER); + if(substChar) { return static_cast(substChar->Get()); } @@ -1128,10 +1128,20 @@ TextField::~TextField() } } +Vector TextField::GetTextSize(const uint32_t startIndex, const uint32_t endIndex) const +{ + return mController->GetTextSize(startIndex, endIndex); +} + +Vector TextField::GetTextPosition(const uint32_t startIndex, const uint32_t endIndex) const +{ + return mController->GetTextPosition(startIndex, endIndex); +} + std::string TextField::AccessibleImpl::GetName() { auto self = Toolkit::TextField::DownCast(Self()); - if (IsHiddenInput(self)) + if(IsHiddenInput(self)) { return {}; } @@ -1193,8 +1203,8 @@ bool TextField::AccessibleImpl::SetCursorOffset(size_t offset) Dali::Accessibility::Range TextField::AccessibleImpl::GetTextAtOffset( size_t offset, Dali::Accessibility::TextBoundary boundary) { - auto self = Toolkit::TextField::DownCast(Self()); - auto range = Dali::Accessibility::Range{}; + auto self = Toolkit::TextField::DownCast(Self()); + auto range = Dali::Accessibility::Range{}; if(IsHiddenInput(self)) { @@ -1297,14 +1307,14 @@ Dali::Accessibility::Range TextField::AccessibleImpl::GetRangeOfSelection(size_t return {}; } - auto self = Toolkit::TextField::DownCast(Self()); + auto self = Toolkit::TextField::DownCast(Self()); auto controller = Dali::Toolkit::GetImpl(self).GetTextController(); - auto indices = controller->GetSelectionIndexes(); + auto indices = controller->GetSelectionIndexes(); auto startOffset = static_cast(indices.first); - auto endOffset = static_cast(indices.second); + auto endOffset = static_cast(indices.second); - if (IsHiddenInput(self)) + if(IsHiddenInput(self)) { return {startOffset, endOffset, std::string(endOffset - startOffset, GetSubstituteCharacter(self))}; }