const char* const PROPERTY_NAME_ANCHOR_COLOR = "anchorColor";
const char* const PROPERTY_NAME_ANCHOR_CLICKED_COLOR = "anchorClickedColor";
+const char* const PROPERTY_NAME_REMOVE_FRONT_INSET = "removeFrontInset";
+const char* const PROPERTY_NAME_REMOVE_BACK_INSET = "removeBackInset";
+
const std::string DEFAULT_FONT_DIR("/resources/fonts");
const unsigned int EMOJI_FONT_SIZE = 3840u; // 60 * 64
DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_STRIKETHROUGH) == DevelTextLabel::Property::STRIKETHROUGH);
DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_ANCHOR_COLOR) == DevelTextLabel::Property::ANCHOR_COLOR);
DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_ANCHOR_CLICKED_COLOR) == DevelTextLabel::Property::ANCHOR_CLICKED_COLOR);
+ DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_REMOVE_FRONT_INSET) == DevelTextLabel::Property::REMOVE_FRONT_INSET);
+ DALI_TEST_CHECK(label.GetPropertyIndex(PROPERTY_NAME_REMOVE_BACK_INSET) == DevelTextLabel::Property::REMOVE_BACK_INSET);
END_TEST;
}
application.SendNotification();
application.Render();
+ // Check Remove Front/Back Inset Property
+ DALI_TEST_CHECK(label.GetProperty<bool>(DevelTextLabel::Property::REMOVE_FRONT_INSET));
+ label.SetProperty(DevelTextLabel::Property::REMOVE_FRONT_INSET, false);
+ DALI_TEST_CHECK(!label.GetProperty<bool>(DevelTextLabel::Property::REMOVE_FRONT_INSET));
+
+ DALI_TEST_CHECK(label.GetProperty<bool>(DevelTextLabel::Property::REMOVE_BACK_INSET));
+ label.SetProperty(DevelTextLabel::Property::REMOVE_BACK_INSET, false);
+ DALI_TEST_CHECK(!label.GetProperty<bool>(DevelTextLabel::Property::REMOVE_BACK_INSET));
+
+ application.SendNotification();
+ application.Render();
+
END_TEST;
}
TestTextGeometryUtils::CheckRectGeometryResult(textBoundingRectangle, expectedTextBoundingRectangle);
END_TEST;
+}
+
+int utcDaliTextLabelRemoveFrontInset(void)
+{
+ ToolkitTestApplication application;
+ tet_infoline(" utcDaliTextLabelRemoveFrontInset");
+
+ TextLabel label = TextLabel::New();
+ DALI_TEST_CHECK(label);
+
+ application.GetScene().Add(label);
+ application.SendNotification();
+ application.Render();
+
+ DevelTextLabel::SetRemoveFrontInset(label, false);
+ DALI_TEST_CHECK(!DevelTextLabel::IsRemoveFrontInset(label));
+
+ END_TEST;
+}
+
+int utcDaliTextLabelRemoveBackInset(void)
+{
+ ToolkitTestApplication application;
+ tet_infoline(" utcDaliTextLabelRemoveBackInset");
+
+ TextLabel label = TextLabel::New();
+ DALI_TEST_CHECK(label);
+
+ application.GetScene().Add(label);
+ application.SendNotification();
+ application.Render();
+
+ DevelTextLabel::SetRemoveBackInset(label, false);
+ DALI_TEST_CHECK(!DevelTextLabel::IsRemoveBackInset(label));
+
+ END_TEST;
}
\ No newline at end of file
return GetImpl(textLabel).IsTextFitArrayEnabled();
}
+void SetRemoveFrontInset(TextLabel textLabel, const bool remove)
+{
+ GetImpl(textLabel).SetRemoveFrontInset(remove);
+}
+
+bool IsRemoveFrontInset(TextLabel textLabel)
+{
+ return GetImpl(textLabel).IsRemoveFrontInset();
+}
+
+void SetRemoveBackInset(TextLabel textLabel, const bool remove)
+{
+ GetImpl(textLabel).SetRemoveBackInset(remove);
+}
+
+bool IsRemoveBackInset(TextLabel textLabel)
+{
+ return GetImpl(textLabel).IsRemoveBackInset();
+}
+
} // namespace DevelTextLabel
} // namespace Toolkit
* @note If there is a color attribute in the anchor tag, the markup attribute takes precedence.
*/
ANCHOR_CLICKED_COLOR,
+
+ /**
+ * @brief Whether to trim the xBearing of first glyph of the text.
+ * @details Name "removeFrontInset", type Property::BOOLEAN.
+ */
+ REMOVE_FRONT_INSET,
+
+ /**
+ * @brief Whether to trim the advance of last glyph of the text.
+ * @details Name "removeBackInset", type Property::BOOLEAN.
+ */
+ REMOVE_BACK_INSET,
};
} // namespace Property
DALI_TOOLKIT_API bool IsTextFitArrayEnabled(TextLabel textLabel);
/**
+ * @brief Set removing front inset to text label.
+ *
+ * @param[in] textLabel The instance of TextLabel.
+ * @param[in] remove Whether front inset of text label has to be removed or not.
+ */
+DALI_TOOLKIT_API void SetRemoveFrontInset(TextLabel textLabel, const bool remove);
+
+/**
+ * @brief Whether front inset of text label is removed or not.
+ *
+ * @param[in] textLabel The instance of TextLabel.
+ * @return True if the front inset of text label is removed.
+ */
+DALI_TOOLKIT_API bool IsRemoveFrontInset(TextLabel textLabel);
+
+/**
+ * @brief Set removing back inset to text label.
+ *
+ * @param[in] textLabel The instance of TextLabel.
+ * @param[in] remove Whether back inset of text label has to be removed or not.
+ */
+DALI_TOOLKIT_API void SetRemoveBackInset(TextLabel textLabel, const bool remove);
+
+/**
+ * @brief Whether back inset of text label is removed or not.
+ *
+ * @param[in] textLabel The instance of TextLabel.
+ * @return True if the back inset of text label is removed.
+ */
+DALI_TOOLKIT_API bool IsRemoveBackInset(TextLabel textLabel);
+
+/**
* @brief Anchor clicked signal type.
*
* @note Signal
DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextLabel, "relativeLineSize", FLOAT, RELATIVE_LINE_SIZE )
DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextLabel, "anchorColor", VECTOR4, ANCHOR_COLOR )
DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextLabel, "anchorClickedColor", VECTOR4, ANCHOR_CLICKED_COLOR )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextLabel, "removeFrontInset", BOOLEAN, REMOVE_FRONT_INSET )
+DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit, TextLabel, "removeBackInset", BOOLEAN, REMOVE_BACK_INSET )
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)
}
break;
}
+ case Toolkit::DevelTextLabel::Property::REMOVE_FRONT_INSET:
+ {
+ const bool remove = value.Get<bool>();
+ impl.mController->SetRemoveFrontInset(remove);
+ break;
+ }
+ case Toolkit::DevelTextLabel::Property::REMOVE_BACK_INSET:
+ {
+ const bool remove = value.Get<bool>();
+ impl.mController->SetRemoveBackInset(remove);
+ break;
+ }
}
// Request relayout when text update is needed. It's necessary to call it
value = impl.mController->GetAnchorClickedColor();
break;
}
+ case Toolkit::DevelTextLabel::Property::REMOVE_FRONT_INSET:
+ {
+ value = impl.mController->IsRemoveFrontInset();
+ break;
+ }
+ case Toolkit::DevelTextLabel::Property::REMOVE_BACK_INSET:
+ {
+ value = impl.mController->IsRemoveBackInset();
+ break;
+ }
}
}
return mController->IsTextFitArrayEnabled();
}
+void TextLabel::SetRemoveFrontInset(bool remove)
+{
+ mController->SetRemoveFrontInset(remove);
+}
+
+bool TextLabel::IsRemoveFrontInset() const
+{
+ return mController->IsRemoveFrontInset();
+}
+
+void TextLabel::SetRemoveBackInset(bool remove)
+{
+ mController->SetRemoveBackInset(remove);
+}
+
+bool TextLabel::IsRemoveBackInset() const
+{
+ return mController->IsRemoveBackInset();
+}
+
std::string TextLabel::TextLabelAccessible::GetNameRaw() const
{
return GetWholeText();
*/
std::string GetLocale();
+ /**
+ * @brief Set removing front inset to text label.
+ *
+ * @param[in] remove Whether front inset of text label has to be removed or not.
+ */
+ void SetRemoveFrontInset(const bool remove);
+
+ /**
+ * @brief Whether front inset of text label is removed or not.
+ *
+ * @return True if the front inset of text label is removed.
+ */
+ bool IsRemoveFrontInset() const;
+
+ /**
+ * @brief Set removing back inset to text label.
+ *
+ * @param[in] remove Whether back inset of text label has to be removed or not.
+ */
+ void SetRemoveBackInset(const bool remove);
+
+ /**
+ * @brief Whether back inset of text label is removed or not.
+ *
+ * @return True if the back inset of text label is removed.
+ */
+ bool IsRemoveBackInset() const;
+
private: // From Control
/**
* @copydoc Control::OnInitialize()
mImpl->mModel->mIgnoreSpacesAfterText = ignore;
}
+bool Controller::IsRemoveFrontInset() const
+{
+ return mImpl->mModel->mRemoveFrontInset;
+}
+
+void Controller::SetRemoveFrontInset(bool remove)
+{
+ mImpl->mModel->mRemoveFrontInset = remove;
+}
+
+bool Controller::IsRemoveBackInset() const
+{
+ return mImpl->mModel->mRemoveBackInset;
+}
+
+void Controller::SetRemoveBackInset(bool remove)
+{
+ mImpl->mModel->mRemoveBackInset = remove;
+}
+
void Controller::ChangedLayoutDirection()
{
mImpl->mIsLayoutDirectionChanged = true;
void SetIgnoreSpacesAfterText(bool ignore);
/**
+ * @brief Retrieves removeFrontInset value from model
+ * @return The value of removeFrontInset
+ */
+ bool IsRemoveFrontInset() const;
+
+ /**
+ * @brief Sets removeFrontInset value to model
+ * @param[in] remove The value of removeFrontInset for the text
+ */
+ void SetRemoveFrontInset(bool remove);
+
+ /**
+ * @brief Retrieves removeBackInset value from model
+ * @return The value of removeBackInset
+ */
+ bool IsRemoveBackInset() const;
+
+ /**
+ * @brief Sets removeBackInset value to model
+ * @param[in] remove The value of removeBackInset for the text
+ */
+ void SetRemoveBackInset(bool remove);
+
+ /**
* @brief Sets SetMatchLayoutDirection value to model
* @param[in] match The value of matchLayoutDirection for the text
*/
{
whiteSpaceLengthEndOfLine = 0.f;
}
- length = std::max(length, penX + glyphMetrics.xBearing + glyphMetrics.width);
+
+ if(parameters.textModel->mRemoveBackInset)
+ {
+ length = std::max(length, penX + glyphMetrics.xBearing + glyphMetrics.width);
+ }
+ else
+ {
+ length = std::max(length, penX + glyphMetrics.advance);
+ }
+
penX += (glyphMetrics.advance + parameters.interGlyphExtraAdvance);
}
}
{
whiteSpaceLengthEndOfLine = 0.f;
}
- length = std::max(length, penX + glyphMetrics.xBearing + glyphMetrics.width);
+
+ if(parameters.textModel->mRemoveBackInset)
+ {
+ length = std::max(length, penX + glyphMetrics.xBearing + glyphMetrics.width);
+ }
+ else
+ {
+ length = std::max(length, penX + glyphMetrics.advance);
+ }
penX += (glyphMetrics.advance + parameters.interGlyphExtraAdvance);
}
}
// The initial start point is zero. However it needs a correction according the 'x' bearing of the first glyph.
// i.e. if the bearing of the first glyph is negative it may exceed the boundaries of the text area.
// It needs to add as well space for the cursor if the text is in edit mode and extra space in case the text is outlined.
- tmpLineLayout.penX = -glyphMetrics.xBearing + mCursorWidth + outlineWidth;
+
+ tmpLineLayout.penX = mCursorWidth + outlineWidth;
+ if(parameters.textModel->mRemoveFrontInset)
+ {
+ tmpLineLayout.penX -= glyphMetrics.xBearing;
+ }
tmpLineLayout.relativeLineSize = lineLayout.relativeLineSize;
tmpLineLayout.penX += tmpLineLayout.previousAdvance + tmpLineLayout.whiteSpaceLengthEndOfLine;
tmpLineLayout.previousAdvance = (glyphMetrics.advance + parameters.interGlyphExtraAdvance);
- tmpLineLayout.length = std::max(tmpLineLayout.length, tmpLineLayout.penX + glyphMetrics.xBearing + glyphMetrics.width);
+ if(parameters.textModel->mRemoveBackInset)
+ {
+ tmpLineLayout.length = std::max(tmpLineLayout.length, tmpLineLayout.penX + glyphMetrics.xBearing + glyphMetrics.width);
+ }
+ else
+ {
+ tmpLineLayout.length = std::max(tmpLineLayout.length, tmpLineLayout.penX + glyphMetrics.advance);
+ }
// Clear the white space length at the end of the line.
tmpLineLayout.whiteSpaceLengthEndOfLine = 0.f;
// If it has a negative x bearing, it will exceed the boundaries of the actor,
// so the penX position needs to be moved to the right.
const GlyphInfo& glyph = *(glyphsBuffer + startIndexForGlyph);
- float penX = -glyph.xBearing + mCursorWidth + outlineWidth; //
+ float penX = mCursorWidth + outlineWidth; //
+
+ if(layoutParameters.textModel->mRemoveFrontInset)
+ {
+ penX -= glyph.xBearing;
+ }
CalculateGlyphPositionsLTR(layoutParameters.textModel->mVisualModel,
layoutParameters.textModel->mLogicalModel,
mAlignmentOffset(0.0f),
mElideEnabled(false),
mIgnoreSpacesAfterText(true),
+ mRemoveFrontInset(true),
+ mRemoveBackInset(true),
mMatchLayoutDirection(DevelText::MatchLayoutDirection::INHERIT),
mEllipsisPosition(DevelText::EllipsisPosition::END)
{
float mAlignmentOffset; ///< The alignment offset.
bool mElideEnabled : 1; ///< Whether the text's elide is enabled.
bool mIgnoreSpacesAfterText : 1; ///< Whether ignoring spaces after text or not. Default is true.
+ bool mRemoveFrontInset : 1; ///< Whether to ignore xBearing of the first glyph. Default is true.
+ bool mRemoveBackInset : 1; ///< Whether to ignore advance of the last glyph. Default is true.
DevelText::MatchLayoutDirection mMatchLayoutDirection; ///< Whether to match text alignment with layout direction or not.
DevelText::EllipsisPosition::Type mEllipsisPosition; ///< Where is the location the text elide
Vector2 mVisualTransformOffset; ///< The offset of the layout based on the controller due to alignment.
projects / platform / core / uifw / dali-toolkit.git / commitdiff