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=7fc3eca9c72c073b620c1064c05e26bf32be08a9;hp=8b60fbe32397644027cd5fc35cc45d6ebcfe6981;hb=92cbca2f5bd2e15fa589448d4c884b71f4fef03c;hpb=b0115c8f21708cab60e853767d353e35c8b59ebd 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 8b60fbe..7fc3eca 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -137,10 +137,12 @@ DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "selectedTextEnd" DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "enableEditing", BOOLEAN, ENABLE_EDITING ) DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "fontSizeScale", FLOAT, FONT_SIZE_SCALE ) DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "primaryCursorPosition", INTEGER, PRIMARY_CURSOR_POSITION ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextField, "grabHandleColor", VECTOR4, GRAB_HANDLE_COLOR ) DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "textChanged", SIGNAL_TEXT_CHANGED ) DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "maxLengthReached", SIGNAL_MAX_LENGTH_REACHED ) DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "inputStyleChanged", SIGNAL_INPUT_STYLE_CHANGED) +DALI_SIGNAL_REGISTRATION(Toolkit, TextField, "anchorClicked", SIGNAL_ANCHOR_CLICKED ) DALI_TYPE_REGISTRATION_END() // clang-format on @@ -754,6 +756,15 @@ void TextField::SetProperty(BaseObject* object, Property::Index index, const Pro } break; } + case Toolkit::DevelTextField::Property::GRAB_HANDLE_COLOR: + { + const Vector4 color = value.Get(); + DALI_LOG_INFO(gLogFilter, Debug::General, "TextField %p GRAB_HANDLE_COLOR %f,%f,%f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a); + + impl.mDecorator->SetHandleColor(color); + impl.RequestTextRelayout(); + break; + } } // switch } // textfield } @@ -1104,6 +1115,11 @@ Property::Value TextField::GetProperty(BaseObject* object, Property::Index index value = static_cast(impl.mController->GetPrimaryCursorPosition()); break; } + case Toolkit::DevelTextField::Property::GRAB_HANDLE_COLOR: + { + value = impl.mDecorator->GetHandleColor(); + break; + } } //switch } @@ -1180,6 +1196,14 @@ bool TextField::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* { field.InputStyleChangedSignal().Connect(tracker, functor); } + else if(0 == strcmp(signalName.c_str(), SIGNAL_ANCHOR_CLICKED)) + { + if(field) + { + Internal::TextField& fieldImpl(GetImpl(field)); + fieldImpl.AnchorClickedSignal().Connect(tracker, functor); + } + } else { // signalName does not match any signal @@ -1204,11 +1228,16 @@ Toolkit::TextField::InputStyleChangedSignalType& TextField::InputStyleChangedSig return mInputStyleChangedSignal; } +DevelTextField::AnchorClickedSignalType& TextField::AnchorClickedSignal() +{ + return mAnchorClickedSignal; +} + void TextField::OnInitialize() { Actor self = Self(); - mController = Text::Controller::New(this, this, this); + mController = Text::Controller::New(this, this, this, this); // When using the vector-based rendering, the size of the GLyphs are different TextAbstraction::GlyphType glyphType = (DevelText::RENDERING_VECTOR_BASED == mRenderingBackend) ? TextAbstraction::VECTOR_GLYPH : TextAbstraction::BITMAP_GLYPH; @@ -1335,7 +1364,7 @@ float TextField::GetHeightForWidth(float width) void TextField::ResizeActor(Actor& actor, const Vector2& size) { - if (actor.GetProperty(Dali::Actor::Property::SIZE).GetVectorXY() != size) + if(actor.GetProperty(Dali::Actor::Property::SIZE).GetVectorXY() != size) { actor.SetProperty(Actor::Property::SIZE, size); } @@ -1397,6 +1426,12 @@ void TextField::OnRelayout(const Vector2& size, RelayoutContainer& container) } RenderText(updateTextType); + + // If there is text changed, callback is called. + if(mTextChanged) + { + EmitTextChangedSignal(); + } } // The text-field emits signals when the input style changes. These changes of style are @@ -1598,6 +1633,7 @@ void TextField::OnTap(const TapGesture& gesture) padding = Self().GetProperty(Toolkit::Control::Property::PADDING); const Vector2& localPoint = gesture.GetLocalPoint(); mController->TapEvent(gesture.GetNumberOfTaps(), localPoint.x - padding.start, localPoint.y - padding.top); + mController->AnchorEvent(localPoint.x - padding.start, localPoint.y - padding.top); SetKeyInputFocus(); } @@ -1687,10 +1723,23 @@ void TextField::CaretMoved(unsigned int position) } } -void TextField::TextChanged() +void TextField::TextChanged(bool immediate) +{ + if(immediate) // Emits TextChangedSignal immediately + { + EmitTextChangedSignal(); + } + else + { + mTextChanged = true; + } +} + +void TextField::EmitTextChangedSignal() { Dali::Toolkit::TextField handle(GetOwner()); mTextChangedSignal.Emit(handle); + mTextChanged = false; } void TextField::MaxLengthReached() @@ -1749,6 +1798,12 @@ void TextField::InputStyleChanged(Text::InputStyle::Mask inputStyleMask) mInputStyleChangedSignal.Emit(handle, fieldInputStyleMask); } +void TextField::AnchorClicked(const std::string& href) +{ + Dali::Toolkit::TextField handle(GetOwner()); + mAnchorClickedSignal.Emit(handle, href.c_str(), href.length()); +} + void TextField::AddDecoration(Actor& actor, bool needsClipping) { if(actor) @@ -1867,7 +1922,8 @@ TextField::TextField() mAlignmentOffset(0.f), mRenderingBackend(DEFAULT_RENDERING_BACKEND), mExceedPolicy(Dali::Toolkit::TextField::EXCEED_POLICY_CLIP), - mHasBeenStaged(false) + mHasBeenStaged(false), + mTextChanged(false) { } @@ -1883,7 +1939,7 @@ TextField::~TextField() std::string TextField::AccessibleImpl::GetName() { - auto slf = Toolkit::TextField::DownCast(self); + auto slf = Toolkit::TextField::DownCast(Self()); return slf.GetProperty(Toolkit::TextField::Property::TEXT).Get(); } @@ -1893,7 +1949,7 @@ std::string TextField::AccessibleImpl::GetText(size_t startOffset, if(endOffset <= startOffset) return {}; - auto slf = Toolkit::TextField::DownCast(self); + auto slf = Toolkit::TextField::DownCast(Self()); auto txt = slf.GetProperty(Toolkit::TextField::Property::TEXT).Get(); @@ -1905,7 +1961,7 @@ std::string TextField::AccessibleImpl::GetText(size_t startOffset, size_t TextField::AccessibleImpl::GetCharacterCount() { - auto slf = Toolkit::TextField::DownCast(self); + auto slf = Toolkit::TextField::DownCast(Self()); auto txt = slf.GetProperty(Toolkit::TextField::Property::TEXT).Get(); @@ -1914,13 +1970,13 @@ size_t TextField::AccessibleImpl::GetCharacterCount() size_t TextField::AccessibleImpl::GetCaretOffset() { - auto slf = Toolkit::TextField::DownCast(self); + auto slf = Toolkit::TextField::DownCast(Self()); return Dali::Toolkit::GetImpl(slf).getController()->GetCursorPosition(); } bool TextField::AccessibleImpl::SetCaretOffset(size_t offset) { - auto slf = Toolkit::TextField::DownCast(self); + auto slf = Toolkit::TextField::DownCast(Self()); auto txt = slf.GetProperty(Toolkit::TextField::Property::TEXT).Get(); if(offset > txt.size()) return false; @@ -1934,7 +1990,7 @@ bool TextField::AccessibleImpl::SetCaretOffset(size_t offset) Dali::Accessibility::Range TextField::AccessibleImpl::GetTextAtOffset( size_t offset, Dali::Accessibility::TextBoundary boundary) { - auto slf = Toolkit::TextField::DownCast(self); + auto slf = Toolkit::TextField::DownCast(Self()); auto txt = slf.GetProperty(Toolkit::TextField::Property::TEXT).Get(); auto txt_size = txt.size(); @@ -2014,7 +2070,7 @@ TextField::AccessibleImpl::GetSelection(size_t selectionNum) if(selectionNum > 0) return {}; - auto slf = Toolkit::TextField::DownCast(self); + auto slf = Toolkit::TextField::DownCast(Self()); auto ctrl = Dali::Toolkit::GetImpl(slf).getController(); std::string ret; ctrl->RetrieveSelection(ret); @@ -2029,7 +2085,7 @@ bool TextField::AccessibleImpl::RemoveSelection(size_t selectionNum) if(selectionNum > 0) return false; - auto slf = Toolkit::TextField::DownCast(self); + auto slf = Toolkit::TextField::DownCast(Self()); Dali::Toolkit::GetImpl(slf).getController()->SetSelection(0, 0); return true; } @@ -2042,7 +2098,7 @@ bool TextField::AccessibleImpl::SetSelection(size_t selectionNum, if(selectionNum > 0) return false; - auto slf = Toolkit::TextField::DownCast(self); + auto slf = Toolkit::TextField::DownCast(Self()); Dali::Toolkit::GetImpl(slf).getController()->SetSelection(startOffset, endOffset); return true; @@ -2054,7 +2110,7 @@ bool TextField::AccessibleImpl::CopyText(size_t startPosition, if(endPosition <= startPosition) return false; - auto slf = Toolkit::TextField::DownCast(self); + auto slf = Toolkit::TextField::DownCast(Self()); auto txt = slf.GetProperty(Toolkit::TextField::Property::TEXT).Get(); Dali::Toolkit::GetImpl(slf).getController()->CopyStringToClipboard(txt.substr(startPosition, endPosition - startPosition)); @@ -2067,7 +2123,7 @@ bool TextField::AccessibleImpl::CutText(size_t startPosition, if(endPosition <= startPosition) return false; - auto slf = Toolkit::TextField::DownCast(self); + auto slf = Toolkit::TextField::DownCast(Self()); auto txt = slf.GetProperty(Toolkit::TextField::Property::TEXT).Get(); Dali::Toolkit::GetImpl(slf).getController()->CopyStringToClipboard(txt.substr(startPosition, endPosition - startPosition));