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-label-impl.cpp;h=21e13c82052709c7ea6addfa63f5cfd396c172b5;hp=2e8c7aedc7f9d7f7777d2f4f59f9afa96c2a17c4;hb=91a31a5bdf35ebea5818c3809467b6fb74a547a2;hpb=3feac03362a8bb2d90a8b3e5defe9d2d704d2d3c diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp index 2e8c7ae..21e13c8 100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp @@ -19,8 +19,8 @@ #include // EXTERNAL INCLUDES +#include #include -#include #include #include #include @@ -47,6 +47,7 @@ #include #include +// DEVEL INCLUDES #include using namespace Dali::Toolkit::Text; @@ -133,6 +134,7 @@ DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextLabel, "textFit", DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextLabel, "minLineSize", FLOAT, MIN_LINE_SIZE ) DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextLabel, "renderingBackend", INTEGER, RENDERING_BACKEND ) DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextLabel, "fontSizeScale", FLOAT, FONT_SIZE_SCALE ) +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextLabel, "ellipsisPosition", INTEGER, ELLIPSIS_POSITION ) DALI_ANIMATABLE_PROPERTY_REGISTRATION_WITH_DEFAULT(Toolkit, TextLabel, "textColor", Color::BLACK, TEXT_COLOR ) DALI_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION(Toolkit, TextLabel, "textColorRed", TEXT_COLOR_RED, TEXT_COLOR, 0) @@ -264,6 +266,17 @@ void TextLabel::SetProperty(BaseObject* object, Property::Index index, const Pro case Toolkit::TextLabel::Property::TEXT: { impl.mController->SetText(value.Get()); + + if(impl.mController->HasAnchors()) + { + // Forward input events to controller + impl.EnableGestureDetection(static_cast(GestureType::TAP)); + } + else + { + impl.DisableGestureDetection(static_cast(GestureType::TAP)); + } + break; } case Toolkit::TextLabel::Property::FONT_FAMILY: @@ -316,6 +329,16 @@ void TextLabel::SetProperty(BaseObject* object, Property::Index index, const Pro { const bool enableMarkup = value.Get(); impl.mController->SetMarkupProcessorEnabled(enableMarkup); + + if(impl.mController->HasAnchors()) + { + // Forward input events to controller + impl.EnableGestureDetection(static_cast(GestureType::TAP)); + } + else + { + impl.DisableGestureDetection(static_cast(GestureType::TAP)); + } break; } case Toolkit::TextLabel::Property::ENABLE_AUTO_SCROLL: @@ -456,7 +479,7 @@ void TextLabel::SetProperty(BaseObject* object, Property::Index index, const Pro } case Toolkit::DevelTextLabel::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION: { - impl.mController->SetMatchSystemLanguageDirection(value.Get()); + impl.mController->SetMatchLayoutDirection(value.Get() ? DevelText::MatchLayoutDirection::LOCALE : DevelText::MatchLayoutDirection::CONTENTS); break; } case Toolkit::DevelTextLabel::Property::TEXT_FIT: @@ -481,6 +504,16 @@ void TextLabel::SetProperty(BaseObject* object, Property::Index index, const Pro } break; } + case Toolkit::DevelTextLabel::Property::ELLIPSIS_POSITION: + { + DevelText::EllipsisPosition::Type ellipsisPositionType(static_cast(-1)); // Set to invalid value to ensure a valid mode does get set + if(GetEllipsisPositionTypeEnumeration(value, ellipsisPositionType)) + { + DALI_LOG_INFO(gLogFilter, Debug::General, "TextLabel %p EllipsisPosition::Type %d\n", impl.mController.Get(), ellipsisPositionType); + impl.mController->SetEllipsisPosition(ellipsisPositionType); + } + break; + } } // Request relayout when text update is needed. It's necessary to call it @@ -494,7 +527,7 @@ void TextLabel::SetProperty(BaseObject* object, Property::Index index, const Pro } } -Text::ControllerPtr TextLabel::getController() +Text::ControllerPtr TextLabel::GetTextController() { return mController; } @@ -687,7 +720,7 @@ Property::Value TextLabel::GetProperty(BaseObject* object, Property::Index index } case Toolkit::DevelTextLabel::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION: { - value = impl.mController->IsMatchSystemLanguageDirection(); + value = impl.mController->GetMatchLayoutDirection() != DevelText::MatchLayoutDirection::CONTENTS; break; } case Toolkit::DevelTextLabel::Property::TEXT_FIT: @@ -717,6 +750,11 @@ Property::Value TextLabel::GetProperty(BaseObject* object, Property::Index index value = impl.mController->GetFontSizeScale(); break; } + case Toolkit::DevelTextLabel::Property::ELLIPSIS_POSITION: + { + value = impl.mController->GetEllipsisPosition(); + break; + } } } @@ -785,9 +823,7 @@ void TextLabel::OnInitialize() Dali::LayoutDirection::Type layoutDirection = static_cast(stage.GetRootLayer().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get()); mController->SetLayoutDirection(layoutDirection); - // Forward input events to controller - EnableGestureDetection(static_cast(GestureType::TAP)); - GetTapGestureDetector().SetMaximumTapsRequired(1); + self.LayoutDirectionChangedSignal().Connect(this, &TextLabel::OnLayoutDirectionChanged); Layout::Engine& engine = mController->GetLayoutEngine(); engine.SetCursorWidth(0u); // Do not layout space for the cursor. @@ -895,8 +931,10 @@ void TextLabel::OnRelayout(const Vector2& size, RelayoutContainer& container) { DALI_LOG_INFO(gLogFilter, Debug::General, "TextLabel::OnRelayout\n"); + Actor self = Self(); + Extents padding; - padding = Self().GetProperty(Toolkit::Control::Property::PADDING); + padding = self.GetProperty(Toolkit::Control::Property::PADDING); Vector2 contentSize(size.x - (padding.start + padding.end), size.y - (padding.top + padding.bottom)); @@ -907,15 +945,8 @@ void TextLabel::OnRelayout(const Vector2& size, RelayoutContainer& container) } // Support Right-To-Left - Dali::LayoutDirection::Type layoutDirection; - if(mController->IsMatchSystemLanguageDirection()) - { - layoutDirection = static_cast(DevelWindow::Get(Self()).GetRootLayer().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get()); - } - else - { - layoutDirection = static_cast(Self().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get()); - } + Dali::LayoutDirection::Type layoutDirection = mController->GetLayoutDirection(self); + const Text::Controller::UpdateTextType updateTextType = mController->Relayout(contentSize, layoutDirection); if((Text::Controller::NONE_UPDATED != (Text::Controller::MODEL_UPDATED & updateTextType)) || mTextUpdateNeeded) @@ -1044,6 +1075,11 @@ void TextLabel::ScrollingFinished() RequestTextRelayout(); } +void TextLabel::OnLayoutDirectionChanged(Actor actor, LayoutDirection::Type type) +{ + mController->ChangedLayoutDirection(); +} + TextLabel::TextLabel() : Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)), mRenderingBackend(DEFAULT_RENDERING_BACKEND), @@ -1057,8 +1093,8 @@ TextLabel::~TextLabel() std::string TextLabel::AccessibleImpl::GetNameRaw() { - auto slf = Toolkit::TextLabel::DownCast(self); - return slf.GetProperty(Toolkit::TextLabel::Property::TEXT).Get(); + auto self = Toolkit::TextLabel::DownCast(Self()); + return self.GetProperty(Toolkit::TextLabel::Property::TEXT).Get(); } Property::Index TextLabel::AccessibleImpl::GetNamePropertyIndex() @@ -1066,47 +1102,47 @@ Property::Index TextLabel::AccessibleImpl::GetNamePropertyIndex() return Toolkit::TextLabel::Property::TEXT; } -std::string TextLabel::AccessibleImpl::GetText(size_t startOffset, - size_t endOffset) +std::string TextLabel::AccessibleImpl::GetText(size_t startOffset, size_t endOffset) { if(endOffset <= startOffset) + { return {}; + } - auto slf = Toolkit::TextLabel::DownCast(self); - auto txt = - slf.GetProperty(Toolkit::TextLabel::Property::TEXT).Get(); + auto self = Toolkit::TextLabel::DownCast(Self()); + auto text = self.GetProperty(Toolkit::TextLabel::Property::TEXT).Get(); - if(startOffset > txt.size() || endOffset > txt.size()) + if(startOffset > text.size() || endOffset > text.size()) + { return {}; + } - return txt.substr(startOffset, endOffset - startOffset); + return text.substr(startOffset, endOffset - startOffset); } size_t TextLabel::AccessibleImpl::GetCharacterCount() { - auto slf = Toolkit::TextLabel::DownCast(self); - auto txt = - slf.GetProperty(Toolkit::TextLabel::Property::TEXT).Get(); + auto self = Toolkit::TextLabel::DownCast(Self()); + auto text = self.GetProperty(Toolkit::TextLabel::Property::TEXT).Get(); - return txt.size(); + return text.size(); } -size_t TextLabel::AccessibleImpl::GetCaretOffset() +size_t TextLabel::AccessibleImpl::GetCursorOffset() { return {}; } -bool TextLabel::AccessibleImpl::SetCaretOffset(size_t offset) +bool TextLabel::AccessibleImpl::SetCursorOffset(size_t offset) { return {}; } -Dali::Accessibility::Range TextLabel::AccessibleImpl::GetTextAtOffset( - size_t offset, Dali::Accessibility::TextBoundary boundary) +Dali::Accessibility::Range TextLabel::AccessibleImpl::GetTextAtOffset(size_t offset, Dali::Accessibility::TextBoundary boundary) { - auto slf = Toolkit::TextLabel::DownCast(self); - auto txt = slf.GetProperty(Toolkit::TextLabel::Property::TEXT).Get(); - auto txt_size = txt.size(); + auto self = Toolkit::TextLabel::DownCast(Self()); + auto text = self.GetProperty(Toolkit::TextLabel::Property::TEXT).Get(); + auto textSize = text.size(); auto range = Dali::Accessibility::Range{}; @@ -1114,62 +1150,78 @@ Dali::Accessibility::Range TextLabel::AccessibleImpl::GetTextAtOffset( { case Dali::Accessibility::TextBoundary::CHARACTER: { - if(offset < txt_size) + if(offset < textSize) { - range.content = txt[offset]; + range.content = text[offset]; range.startOffset = offset; range.endOffset = offset + 1; } + break; } - break; case Dali::Accessibility::TextBoundary::WORD: case Dali::Accessibility::TextBoundary::LINE: { - auto txt_c_string = txt.c_str(); - auto breaks = std::vector(txt_size, 0); + auto textString = text.c_str(); + auto breaks = std::vector(textSize, 0); + if(boundary == Dali::Accessibility::TextBoundary::WORD) - Accessibility::Accessible::FindWordSeparationsUtf8((const utf8_t*)txt_c_string, txt_size, "", breaks.data()); + { + Accessibility::Accessible::FindWordSeparationsUtf8(reinterpret_cast(textString), textSize, "", breaks.data()); + } else - Accessibility::Accessible::FindLineSeparationsUtf8((const utf8_t*)txt_c_string, txt_size, "", breaks.data()); - auto index = 0u; + { + Accessibility::Accessible::FindLineSeparationsUtf8(reinterpret_cast(textString), textSize, "", breaks.data()); + } + + auto index = 0u; auto counter = 0u; - while(index < txt_size && counter <= offset) + 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 = txt.substr(start, index - start + 1); + range.content = text.substr(start, index - start + 1); range.startOffset = start; range.endOffset = index + 1; } + if(boundary == Dali::Accessibility::TextBoundary::LINE) + { index++; + } } + break; } - break; case Dali::Accessibility::TextBoundary::SENTENCE: { - /* not supported by efl */ + /* not supported by default */ + break; } - break; case Dali::Accessibility::TextBoundary::PARAGRAPH: { /* Paragraph is not supported by libunibreak library */ + break; } - break; default: break; } @@ -1177,44 +1229,46 @@ Dali::Accessibility::Range TextLabel::AccessibleImpl::GetTextAtOffset( return range; } -Dali::Accessibility::Range -TextLabel::AccessibleImpl::GetSelection(size_t selectionNum) +Dali::Accessibility::Range TextLabel::AccessibleImpl::GetRangeOfSelection(size_t selectionIndex) { // Since DALi supports only one selection indexes higher than 0 are ignored - if(selectionNum > 0) + if(selectionIndex > 0) + { return {}; + } - auto slf = Toolkit::TextLabel::DownCast(self); - auto ctrl = Dali::Toolkit::GetImpl(slf).getController(); - std::string ret; - ctrl->RetrieveSelection(ret); - auto r = ctrl->GetSelectionIndexes(); + auto self = Toolkit::TextLabel::DownCast(Self()); + auto controller = Dali::Toolkit::GetImpl(self).GetTextController(); + std::string value{}; + controller->RetrieveSelection(value); + auto indices = controller->GetSelectionIndexes(); - return {static_cast(r.first), static_cast(r.second), ret}; + return {static_cast(indices.first), static_cast(indices.second), value}; } -bool TextLabel::AccessibleImpl::RemoveSelection(size_t selectionNum) +bool TextLabel::AccessibleImpl::RemoveSelection(size_t selectionIndex) { // Since DALi supports only one selection indexes higher than 0 are ignored - if(selectionNum > 0) + if(selectionIndex > 0) + { return false; + } - auto slf = Toolkit::TextLabel::DownCast(self); - Dali::Toolkit::GetImpl(slf).getController()->SetSelection(0, 0); + auto self = Toolkit::TextLabel::DownCast(Self()); + Dali::Toolkit::GetImpl(self).GetTextController()->SetSelection(0, 0); return true; } -bool TextLabel::AccessibleImpl::SetSelection(size_t selectionNum, - size_t startOffset, - size_t endOffset) +bool TextLabel::AccessibleImpl::SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset) { // Since DALi supports only one selection indexes higher than 0 are ignored - if(selectionNum > 0) + if(selectionIndex > 0) + { return false; + } - auto slf = Toolkit::TextLabel::DownCast(self); - Dali::Toolkit::GetImpl(slf).getController()->SetSelection(startOffset, - endOffset); + auto self = Toolkit::TextLabel::DownCast(Self()); + Dali::Toolkit::GetImpl(self).GetTextController()->SetSelection(startOffset, endOffset); return true; }