X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.cpp;h=24772bcecd0412c71e97056b015b04b408c3187b;hb=HEAD;hp=35d06ea4ca2d57bf442a32b61ddc829440508f07;hpb=f0379552a8e3342b6606f5b64558cd24a7198b6c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 35d06ea..8336b14 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,10 +33,10 @@ // INTERNAL INCLUDES #include #include -#include #include #include #include +#include #include #include #include @@ -63,6 +63,7 @@ namespace Internal namespace // unnamed namespace { const unsigned int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::DevelText::DEFAULT_RENDERING_BACKEND; +const char* KEY_RETURN_NAME = "Return"; } // unnamed namespace namespace @@ -145,6 +146,9 @@ DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "ellipsisPosition DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "strikethrough", MAP, STRIKETHROUGH ) DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "inputStrikethrough", MAP, INPUT_STRIKETHROUGH ) DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "characterSpacing", FLOAT, CHARACTER_SPACING ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "selectionPopupStyle", MAP, SELECTION_POPUP_STYLE ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "removeFrontInset", BOOLEAN, REMOVE_FRONT_INSET ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "removeBackInset", BOOLEAN, REMOVE_BACK_INSET ) DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "textChanged", SIGNAL_TEXT_CHANGED ) DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "maxLengthReached", SIGNAL_MAX_LENGTH_REACHED ) @@ -206,34 +210,12 @@ Toolkit::TextField::InputStyle::Mask ConvertInputStyle(Text::InputStyle::Mask in return fieldInputStyleMask; } -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)) - { - return true; - } - return false; -} - -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) - { - return static_cast(substChar->Get()); - } - return STAR; -} - } // namespace -Toolkit::TextField TextField::New() +Toolkit::TextField TextField::New(ControlBehaviour additionalBehaviour) { // Create the implementation, temporarily owned by this handle on stack - IntrusivePtr impl = new TextField(); + IntrusivePtr impl = new TextField(additionalBehaviour); // Pass ownership to CustomActor handle Toolkit::TextField handle(*impl); @@ -550,9 +532,6 @@ void TextField::OnInitialize() self.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT); self.OnSceneSignal().Connect(this, &TextField::OnSceneConnect); - //Enable highightability - self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true); - DevelControl::SetInputMethodContext(*this, mInputMethodContext); if(Dali::Toolkit::TextField::EXCEED_POLICY_CLIP == mExceedPolicy) @@ -560,15 +539,19 @@ void TextField::OnInitialize() EnableClipping(); } - DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) { - return std::unique_ptr( - new AccessibleImpl(actor, Dali::Accessibility::Role::ENTRY)); - }); + // Accessibility + self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::ENTRY); + self.SetProperty(DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true); Accessibility::Bridge::EnabledSignal().Connect(this, &TextField::OnAccessibilityStatusChanged); Accessibility::Bridge::DisabledSignal().Connect(this, &TextField::OnAccessibilityStatusChanged); } +DevelControl::ControlAccessible* TextField::CreateAccessibleObject() +{ + return new TextFieldAccessible(Self()); +} + void TextField::OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change) { DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnStyleChange\n"); @@ -629,6 +612,31 @@ void TextField::ResizeActor(Actor& actor, const Vector2& size) } } +void TextField::OnPropertySet(Property::Index index, const Property::Value& propertyValue) +{ + DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnPropertySet index[%d]\n", index); + + switch(index) + { + case DevelActor::Property::USER_INTERACTION_ENABLED: + { + const bool enabled = propertyValue.Get(); + mController->SetUserInteractionEnabled(enabled); + if(mStencil) + { + float opacity = enabled ? 1.0f : mController->GetDisabledColorOpacity(); + mStencil.SetProperty(Actor::Property::OPACITY, opacity); + } + break; + } + default: + { + Control::OnPropertySet(index, propertyValue); // up call to control for non-handled properties + break; + } + } +} + void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container) { DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField OnRelayout\n"); @@ -660,7 +668,12 @@ void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container) } if(mCursorLayer) { - mCursorLayer.SetProperty(Actor::Property::POSITION, Vector2(padding.start, padding.top)); + if(!mStencil) + { + // If there is a stencil, the cursor layer is added to the stencil in RenderText. + // Do not calculate the position because the stencil has already been resized excluding the padding size. + mCursorLayer.SetProperty(Actor::Property::POSITION, Vector2(padding.start, padding.top)); + } ResizeActor(mCursorLayer, contentSize); } @@ -680,7 +693,7 @@ void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container) if(mDecorator && (Text::Controller::NONE_UPDATED != (Text::Controller::DECORATOR_UPDATED & updateTextType))) { - mDecorator->Relayout(contentSize); + mDecorator->Relayout(contentSize, container); } if(!mRenderer) @@ -717,17 +730,7 @@ void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container) // The text-field adds an idle callback to the adaptor to emit the signals after the size negotiation. if(!mController->IsInputStyleChangedSignalsQueueEmpty()) { - if(Adaptor::IsAvailable()) - { - Adaptor& adaptor = Adaptor::Get(); - - if(NULL == mIdleCallback) - { - // @note: The callback manager takes the ownership of the callback object. - mIdleCallback = MakeCallback(this, &TextField::OnIdleSignal); - adaptor.AddIdle(mIdleCallback, false); - } - } + mController->RequestProcessInputStyleChangedSignals(); } } @@ -738,7 +741,7 @@ Text::ControllerPtr TextField::GetTextController() void TextField::RenderText(Text::Controller::UpdateTextType updateTextType) { - CommonTextUtils::RenderText(Self(), mRenderer, mController, mDecorator, mAlignmentOffset, mRenderableActor, mBackgroundActor, mStencil, mClippingDecorationActors, mAnchorActors, updateTextType); + CommonTextUtils::RenderText(Self(), mRenderer, mController, mDecorator, mAlignmentOffset, mRenderableActor, mBackgroundActor, mCursorLayer, mStencil, mClippingDecorationActors, mAnchorActors, updateTextType); } void TextField::OnKeyInputFocusGained() @@ -760,15 +763,12 @@ void TextField::OnKeyInputFocusGained() // When window gain lost focus, the inputMethodContext is deactivated. Thus when window gain focus again, the inputMethodContext must be activated. mInputMethodContext.SetRestoreAfterFocusLost(true); } - ClipboardEventNotifier notifier(ClipboardEventNotifier::Get()); - if(notifier) + if(IsEditable() && mController->IsUserInteractionEnabled()) { - notifier.ContentSelectedSignal().Connect(this, &TextField::OnClipboardTextSelected); + mController->KeyboardFocusGainEvent(); // Called in the case of no virtual keyboard to trigger this event } - mController->KeyboardFocusGainEvent(); // Called in the case of no virtual keyboard to trigger this event - EmitKeyInputFocusSignal(true); // Calls back into the Control hence done last. } @@ -786,12 +786,6 @@ void TextField::OnKeyInputFocusLost() mInputMethodContext.EventReceivedSignal().Disconnect(this, &TextField::OnInputMethodContextEvent); } - ClipboardEventNotifier notifier(ClipboardEventNotifier::Get()); - - if(notifier) - { - notifier.ContentSelectedSignal().Disconnect(this, &TextField::OnClipboardTextSelected); - } mController->KeyboardFocusLostEvent(); @@ -807,10 +801,7 @@ bool TextField::OnAccessibilityActivated() void TextField::OnTap(const TapGesture& gesture) { DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::OnTap %p\n", mController.Get()); - if(mInputMethodContext && IsEditable()) - { - mInputMethodContext.Activate(); - } + // Deliver the tap before the focus event to controller; this allows us to detect when focus is gained due to tap-gestures Extents padding; padding = Self().GetProperty(Toolkit::Control::Property::PADDING); @@ -818,12 +809,21 @@ void TextField::OnTap(const TapGesture& gesture) mController->TapEvent(gesture.GetNumberOfTaps(), localPoint.x - padding.start, localPoint.y - padding.top); mController->AnchorEvent(localPoint.x - padding.start, localPoint.y - padding.top); + Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get(); + if(keyboardFocusManager) + { + keyboardFocusManager.SetCurrentFocusActor(Self()); + } SetKeyInputFocus(); } void TextField::OnPan(const PanGesture& gesture) { mController->PanEvent(gesture.GetState(), gesture.GetDisplacement()); + if(gesture.GetState() == GestureState::STARTED && !mController->IsScrollable(gesture.GetDisplacement())) + { + Dali::DevelActor::SetNeedGesturePropagation(Self(), true); + } } void TextField::OnLongPress(const LongPressGesture& gesture) @@ -849,12 +849,17 @@ bool TextField::OnKeyEvent(const KeyEvent& event) // Make sure ClearKeyInputFocus when only key is up if(event.GetState() == KeyEvent::UP) { + Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get(); + if(keyboardFocusManager) + { + keyboardFocusManager.ClearFocus(); + } ClearKeyInputFocus(); } return true; } - else if(Dali::DevelKey::DALI_KEY_RETURN == event.GetKeyCode()) + else if(Dali::DevelKey::DALI_KEY_RETURN == event.GetKeyCode() && KEY_RETURN_NAME == event.GetKeyName()) { // Do nothing when enter is comming. return false; @@ -884,25 +889,28 @@ void TextField::SetEditable(bool editable) void TextField::TextInserted(unsigned int position, unsigned int length, const std::string& content) { - if(Accessibility::IsUp()) + auto accessible = GetAccessibleObject(); + if(DALI_LIKELY(accessible) && accessible->IsHighlighted()) { - Control::Impl::GetAccessibilityObject(Self())->EmitTextInserted(position, length, content); + accessible->EmitTextInserted(position, length, content); } } void TextField::TextDeleted(unsigned int position, unsigned int length, const std::string& content) { - if(Accessibility::IsUp()) + auto accessible = GetAccessibleObject(); + if(DALI_LIKELY(accessible) && accessible->IsHighlighted()) { - Control::Impl::GetAccessibilityObject(Self())->EmitTextDeleted(position, length, content); + accessible->EmitTextDeleted(position, length, content); } } void TextField::CursorPositionChanged(unsigned int oldPosition, unsigned int newPosition) { - if(Accessibility::IsUp()) + auto accessible = GetAccessibleObject(); + if(DALI_LIKELY(accessible) && accessible->IsHighlighted()) { - Control::Impl::GetAccessibilityObject(Self())->EmitTextCursorMoved(newPosition); + accessible->EmitTextCursorMoved(newPosition); } if((oldPosition != newPosition) && !mCursorPositionChanged) @@ -1091,6 +1099,7 @@ void TextField::EnableClipping() mStencil = Control::New(); mStencil.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); mStencil.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + mStencil.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIDDEN, true); // Creates a background visual. Even if the color is transparent it updates the stencil. mStencil.SetProperty(Toolkit::Control::Property::BACKGROUND, @@ -1104,11 +1113,6 @@ void TextField::EnableClipping() } } -void TextField::OnClipboardTextSelected(ClipboardEventNotifier& clipboard) -{ - mController->PasteClipboardItemEvent(); -} - void TextField::KeyboardStatusChanged(bool keyboardShown) { DALI_LOG_INFO(gTextFieldLogFilter, Debug::Verbose, "TextField::KeyboardStatusChanged %p keyboardShown %d\n", mController.Get(), keyboardShown); @@ -1145,18 +1149,8 @@ void TextField::OnLayoutDirectionChanged(Actor actor, LayoutDirection::Type type mController->ChangedLayoutDirection(); } -void TextField::OnIdleSignal() -{ - // Emits the change of input style signals. - mController->ProcessInputStyleChangedSignals(); - - // Set the pointer to null as the callback manager deletes the callback after execute it. - mIdleCallback = NULL; -} - -TextField::TextField() -: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)), - mIdleCallback(NULL), +TextField::TextField(ControlBehaviour additionalBehaviour) +: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT | additionalBehaviour)), mAlignmentOffset(0.f), mRenderingBackend(DEFAULT_RENDERING_BACKEND), mExceedPolicy(Dali::Toolkit::TextField::EXCEED_POLICY_CLIP), @@ -1175,11 +1169,6 @@ TextField::TextField() TextField::~TextField() { UnparentAndReset(mStencil); - - if((NULL != mIdleCallback) && Adaptor::IsAvailable()) - { - Adaptor::Get().RemoveIdle(mIdleCallback); - } } Vector TextField::GetTextSize(const uint32_t startIndex, const uint32_t endIndex) const @@ -1192,340 +1181,104 @@ Vector TextField::GetTextPosition(const uint32_t startIndex, const uint return mController->GetTextPosition(startIndex, endIndex); } -std::string TextField::AccessibleImpl::GetName() const -{ - auto self = Toolkit::TextField::DownCast(Self()); - if(IsHiddenInput(self)) - { - return {}; - } - - return self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); -} - -std::string TextField::AccessibleImpl::GetText(size_t startOffset, size_t endOffset) const +Rect TextField::GetLineBoundingRectangle(const uint32_t lineIndex) const { - if(endOffset <= startOffset) - { - return {}; - } - - auto self = Toolkit::TextField::DownCast(Self()); - auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - - if(startOffset > text.size() || endOffset > text.size()) - { - return {}; - } - if(IsHiddenInput(self)) - { - return std::string(endOffset - startOffset, GetSubstituteCharacter(self)); - } - return text.substr(startOffset, endOffset - startOffset); + return mController->GetLineBoundingRectangle(lineIndex); } -size_t TextField::AccessibleImpl::GetCharacterCount() const +Rect TextField::GetCharacterBoundingRectangle(const uint32_t charIndex) const { - auto self = Toolkit::TextField::DownCast(Self()); - auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - - return text.size(); + return mController->GetCharacterBoundingRectangle(charIndex); } -size_t TextField::AccessibleImpl::GetCursorOffset() const +int TextField::GetCharacterIndexAtPosition(float visualX, float visualY) const { - auto self = Toolkit::TextField::DownCast(Self()); - return Dali::Toolkit::GetImpl(self).GetTextController()->GetCursorPosition(); + return mController->GetCharacterIndexAtPosition(visualX, visualY); } -bool TextField::AccessibleImpl::SetCursorOffset(size_t offset) +Rect<> TextField::GetTextBoundingRectangle(uint32_t startIndex, uint32_t endIndex) const { - auto self = Toolkit::TextField::DownCast(Self()); - auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - if(offset > text.size()) - { - return false; - } - - auto& selfImpl = Dali::Toolkit::GetImpl(self); - selfImpl.GetTextController()->ResetCursorPosition(offset); - selfImpl.RequestTextRelayout(); - - return true; + return mController->GetTextBoundingRectangle(startIndex, endIndex); } -Dali::Accessibility::Range TextField::AccessibleImpl::GetTextAtOffset( - size_t offset, Dali::Accessibility::TextBoundary boundary) const +void TextField::SetSpannedText(const Text::Spanned& spannedText) { - auto self = Toolkit::TextField::DownCast(Self()); - auto range = Dali::Accessibility::Range{}; - - if(IsHiddenInput(self)) - { - // Returning empty object, as there is no possibility to parse the textfield - // when its content is hidden. - return range; - } - - auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - auto textSize = text.size(); - - switch(boundary) - { - case Dali::Accessibility::TextBoundary::CHARACTER: - { - if(offset < textSize) - { - range.content = text[offset]; - range.startOffset = offset; - range.endOffset = offset + 1; - } - break; - } - case Dali::Accessibility::TextBoundary::WORD: - case Dali::Accessibility::TextBoundary::LINE: - { - auto textString = text.c_str(); - auto breaks = std::vector(textSize, 0); - - if(boundary == Dali::Accessibility::TextBoundary::WORD) - { - Accessibility::Accessible::FindWordSeparationsUtf8(reinterpret_cast(textString), textSize, "", breaks.data()); - } - else - { - Accessibility::Accessible::FindLineSeparationsUtf8(reinterpret_cast(textString), textSize, "", breaks.data()); - } - - auto index = 0u; - auto counter = 0u; - while(index < textSize && counter <= offset) - { - auto start = index; - if(breaks[index]) - { - while(breaks[index]) - { - index++; - } - counter++; - } - else - { - if(boundary == Dali::Accessibility::TextBoundary::WORD) - { - index++; - } - if(boundary == Dali::Accessibility::TextBoundary::LINE) - { - counter++; - } - } - - if((counter > 0) && ((counter - 1) == offset)) - { - range.content = text.substr(start, index - start + 1); - range.startOffset = start; - range.endOffset = index + 1; - } - - if(boundary == Dali::Accessibility::TextBoundary::LINE) - { - index++; - } - } - break; - } - case Dali::Accessibility::TextBoundary::SENTENCE: - { - /* not supported by default */ - break; - } - case Dali::Accessibility::TextBoundary::PARAGRAPH: - { - /* Paragraph is not supported by libunibreak library */ - break; - } - default: - break; - } - - return range; + mController->SetSpannedText(spannedText); } -Dali::Accessibility::Range TextField::AccessibleImpl::GetRangeOfSelection(size_t selectionIndex) const +void TextField::SetRemoveFrontInset(bool remove) { - // Since DALi supports only one selection indexes higher than 0 are ignored - if(selectionIndex > 0) - { - return {}; - } - - auto self = Toolkit::TextField::DownCast(Self()); - auto controller = Dali::Toolkit::GetImpl(self).GetTextController(); - auto indices = controller->GetSelectionIndexes(); - - auto startOffset = static_cast(indices.first); - auto endOffset = static_cast(indices.second); - - if(IsHiddenInput(self)) - { - return {startOffset, endOffset, std::string(endOffset - startOffset, GetSubstituteCharacter(self))}; - } - - std::string value{}; - controller->RetrieveSelection(value); - return {startOffset, endOffset, value}; + mController->SetRemoveFrontInset(remove); } -bool TextField::AccessibleImpl::RemoveSelection(size_t selectionIndex) +bool TextField::IsRemoveFrontInset() const { - // Since DALi supports only one selection indexes higher than 0 are ignored - if(selectionIndex > 0) - { - return false; - } - - auto self = Toolkit::TextField::DownCast(Self()); - Dali::Toolkit::GetImpl(self).GetTextController()->SetSelection(0, 0); - return true; + return mController->IsRemoveFrontInset(); } -bool TextField::AccessibleImpl::SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset) +void TextField::SetRemoveBackInset(bool remove) { - // Since DALi supports only one selection indexes higher than 0 are ignored - if(selectionIndex > 0) - { - return false; - } - - auto self = Toolkit::TextField::DownCast(Self()); - Dali::Toolkit::GetImpl(self).GetTextController()->SetSelection(startOffset, endOffset); - return true; + mController->SetRemoveBackInset(remove); } -Rect<> TextField::AccessibleImpl::GetRangeExtents(size_t startOffset, size_t endOffset, Accessibility::CoordinateType type) +bool TextField::IsRemoveBackInset() const { - if (endOffset <= startOffset || endOffset <= 0) - { - return {0, 0, 0, 0}; - } - - auto self = Toolkit::TextField::DownCast(Self()); - auto rect = Dali::Toolkit::GetImpl(self).GetTextController()->GetTextBoundingRectangle(startOffset, endOffset - 1); - - auto componentExtents = this->GetExtents(type); - - rect.x += componentExtents.x; - rect.y += componentExtents.y; - - return rect; + return mController->IsRemoveBackInset(); } -bool TextField::AccessibleImpl::CopyText(size_t startPosition, size_t endPosition) +std::string TextField::TextFieldAccessible::GetName() const { - if(endPosition <= startPosition) + if(IsHiddenInput()) { - return false; + return {}; } - auto self = Toolkit::TextField::DownCast(Self()); - auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - Dali::Toolkit::GetImpl(self).GetTextController()->CopyStringToClipboard(text.substr(startPosition, endPosition - startPosition)); - - return true; + return GetWholeText(); } -bool TextField::AccessibleImpl::CutText(size_t startPosition, size_t endPosition) +const std::vector& TextField::TextFieldAccessible::GetTextAnchors() const { - if(endPosition <= startPosition) - { - return false; - } - auto self = Toolkit::TextField::DownCast(Self()); - auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - Dali::Toolkit::GetImpl(self).GetTextController()->CopyStringToClipboard(text.substr(startPosition, endPosition - startPosition)); - - self.SetProperty(Toolkit::TextField::Property::TEXT, text.substr(0, startPosition) + text.substr(endPosition)); - return true; + return Toolkit::GetImpl(self).mAnchorActors; } -bool TextField::AccessibleImpl::DeleteText(size_t startPosition, size_t endPosition) +Toolkit::Text::ControllerPtr TextField::TextFieldAccessible::GetTextController() const { - if(endPosition <= startPosition) - { - return false; - } - auto self = Toolkit::TextField::DownCast(Self()); - auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - - self.SetProperty(Toolkit::TextField::Property::TEXT, text.substr(0, startPosition) + text.substr(endPosition)); - return true; + return Toolkit::GetImpl(self).GetTextController(); } -Dali::Accessibility::States TextField::AccessibleImpl::CalculateStates() +std::uint32_t TextField::TextFieldAccessible::GetSubstituteCharacter() const { - using namespace Dali::Accessibility; - - auto states = DevelControl::ControlAccessible::CalculateStates(); - - states[State::EDITABLE] = true; - states[State::FOCUSABLE] = true; + auto self = Toolkit::TextField::DownCast(Self()); + auto hiddenInputSettings = self.GetProperty(Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS); + auto substChar = hiddenInputSettings.Find(Toolkit::HiddenInput::Property::SUBSTITUTE_CHARACTER); - Toolkit::Control focusControl = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl(); - if(Self() == focusControl) + if(substChar) { - states[State::FOCUSED] = true; + return static_cast(substChar->Get()); } - return states; -} - -bool TextField::AccessibleImpl::InsertText(size_t startPosition, std::string text) -{ - auto self = Toolkit::TextField::DownCast(Self()); - auto insertedText = self.GetProperty(Toolkit::TextField::Property::TEXT).Get(); - - insertedText.insert(startPosition, text); - - self.SetProperty(Toolkit::TextField::Property::TEXT, std::move(insertedText)); - - return true; + return TextControlAccessible::GetSubstituteCharacter(); } -bool TextField::AccessibleImpl::SetTextContents(std::string newContents) +bool TextField::TextFieldAccessible::IsHiddenInput() const { - auto self = Toolkit::TextField::DownCast(Self()); - self.SetProperty(Toolkit::TextField::Property::TEXT, std::move(newContents)); - return true; -} + auto self = Toolkit::TextField::DownCast(Self()); + auto hiddenInputSettings = self.GetProperty(Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS); + auto mode = hiddenInputSettings.Find(Toolkit::HiddenInput::Property::MODE); -int32_t TextField::AccessibleImpl::GetLinkCount() const -{ - auto self = Toolkit::TextField::DownCast(Self()); - return Dali::Toolkit::GetImpl(self).mAnchorActors.size(); + return (mode && (mode->Get() != Toolkit::HiddenInput::Mode::HIDE_NONE)); } -Accessibility::Hyperlink* TextField::AccessibleImpl::GetLink(int32_t linkIndex) const +void TextField::TextFieldAccessible::RequestTextRelayout() { - if(linkIndex < 0 || linkIndex >= GetLinkCount()) - { - return nullptr; - } - auto self = Toolkit::TextField::DownCast(Self()); - auto anchorActor = Dali::Toolkit::GetImpl(self).mAnchorActors[linkIndex]; - return dynamic_cast(Dali::Accessibility::Accessible::Get(anchorActor)); -} + auto self = Toolkit::TextField::DownCast(Self()); + auto& selfImpl = Toolkit::GetImpl(self); -int32_t TextField::AccessibleImpl::GetLinkIndex(int32_t characterOffset) const -{ - auto self = Toolkit::TextField::DownCast(Self()); - auto controller = Dali::Toolkit::GetImpl(self).GetTextController(); - return controller->GetAnchorIndex(static_cast(characterOffset)); + selfImpl.RequestTextRelayout(); } } // namespace Internal