}
// Strips accelerator character prefixes in |text| if needed, based on |flags|.
-// Returns a range in |text| to underline or gfx::Range::InvalidRange() if
+// Returns a range in |text| to underline or Range::InvalidRange() if
// underlining is not needed.
Range StripAcceleratorChars(int flags, base::string16* text) {
if (flags & (Canvas::SHOW_PREFIX | Canvas::HIDE_PREFIX)) {
Range* range) {
const base::char16 start_char =
(range->IsValid() ? text->at(range->start()) : 0);
- *text = gfx::ElideText(*text, font_list, width, gfx::ELIDE_AT_END);
+ *text = ElideText(*text, font_list, width, ELIDE_TAIL);
if (!range->IsValid())
return;
if (range->start() >= text->length() ||
render_text->SetFontList(font_list);
render_text->SetText(text);
render_text->SetCursorEnabled(false);
-
- Rect display_rect = rect;
- display_rect.set_height(font_list.GetHeight());
- render_text->SetDisplayRect(display_rect);
+ render_text->SetDisplayRect(rect);
// Set the text alignment explicitly based on the directionality of the UI,
// if not specified.
#endif
if ((flags & MULTI_LINE) && *width != 0) {
- gfx::WordWrapBehavior wrap_behavior = gfx::TRUNCATE_LONG_WORDS;
+ WordWrapBehavior wrap_behavior = TRUNCATE_LONG_WORDS;
if (flags & CHARACTER_BREAK)
- wrap_behavior = gfx::WRAP_LONG_WORDS;
+ wrap_behavior = WRAP_LONG_WORDS;
else if (!(flags & NO_ELLIPSIS))
- wrap_behavior = gfx::ELIDE_LONG_WORDS;
+ wrap_behavior = ELIDE_LONG_WORDS;
Rect rect(*width, INT_MAX);
std::vector<base::string16> strings;
- gfx::ElideRectangleText(adjusted_text, font_list,
- rect.width(), rect.height(),
- wrap_behavior, &strings);
+ ElideRectangleText(adjusted_text, font_list, rect.width(), rect.height(),
+ wrap_behavior, &strings);
scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
UpdateRenderText(rect, base::string16(), font_list, flags, 0,
render_text.get());
#endif
scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
- render_text->SetTextShadows(shadows);
+ render_text->set_shadows(shadows);
if (flags & MULTI_LINE) {
- gfx::WordWrapBehavior wrap_behavior = gfx::IGNORE_LONG_WORDS;
+ WordWrapBehavior wrap_behavior = IGNORE_LONG_WORDS;
if (flags & CHARACTER_BREAK)
- wrap_behavior = gfx::WRAP_LONG_WORDS;
+ wrap_behavior = WRAP_LONG_WORDS;
else if (!(flags & NO_ELLIPSIS))
- wrap_behavior = gfx::ELIDE_LONG_WORDS;
+ wrap_behavior = ELIDE_LONG_WORDS;
std::vector<base::string16> strings;
- gfx::ElideRectangleText(adjusted_text,
- font_list,
- text_bounds.width(), text_bounds.height(),
- wrap_behavior,
- &strings);
+ ElideRectangleText(adjusted_text, font_list, text_bounds.width(),
+ text_bounds.height(), wrap_behavior, &strings);
for (size_t i = 0; i < strings.size(); i++) {
Range range = StripAcceleratorChars(flags, &strings[i]);
if (elide_text) {
render_text->SetText(adjusted_text);
if (render_text->GetTextDirection() == base::i18n::LEFT_TO_RIGHT) {
- render_text->set_fade_tail(true);
+ render_text->SetElideBehavior(FADE_TAIL);
elide_text = false;
}
}
#endif
if (elide_text) {
- ElideTextAndAdjustRange(font_list,
- text_bounds.width(),
- &adjusted_text,
+ ElideTextAndAdjustRange(font_list, text_bounds.width(), &adjusted_text,
&range);
}
UpdateRenderText(rect, adjusted_text, font_list, flags, color,
render_text.get());
-
- const int text_height = render_text->GetStringSize().height();
- // Center the text vertically.
- rect += Vector2d(0, (text_bounds.height() - text_height) / 2);
- rect.set_height(text_height);
- render_text->SetDisplayRect(rect);
if (range.IsValid())
render_text->ApplyStyle(UNDERLINE, true, range);
render_text->Draw(this);
DrawImageInt(text_image, display_rect.x() - 1, display_rect.y() - 1);
}
-void Canvas::DrawFadeTruncatingStringRect(
- const base::string16& text,
- TruncateFadeMode truncate_mode,
- const FontList& font_list,
- SkColor color,
- const Rect& display_rect) {
- DrawFadeTruncatingStringRectWithFlags(
- text, truncate_mode, font_list, color, display_rect, NO_ELLIPSIS);
-}
-
-void Canvas::DrawFadeTruncatingStringRectWithFlags(
- const base::string16& text,
- TruncateFadeMode truncate_mode,
- const FontList& font_list,
- SkColor color,
- const Rect& display_rect,
- int flags) {
+void Canvas::DrawFadedString(const base::string16& text,
+ const FontList& font_list,
+ SkColor color,
+ const Rect& display_rect,
+ int flags) {
// If the whole string fits in the destination then just draw it directly.
if (GetStringWidth(text, font_list) <= display_rect.width()) {
DrawStringRectWithFlags(text, font_list, color, display_rect, flags);
return;
}
- scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
- const bool is_rtl = base::i18n::GetFirstStrongCharacterDirection(text) ==
- base::i18n::RIGHT_TO_LEFT;
-
- switch (truncate_mode) {
- case TruncateFadeTail:
- render_text->set_fade_tail(true);
- if (is_rtl)
- flags |= TEXT_ALIGN_RIGHT;
- break;
- case TruncateFadeHead:
- render_text->set_fade_head(true);
- if (!is_rtl)
- flags |= TEXT_ALIGN_RIGHT;
- break;
- }
-
- // Default to left alignment unless right alignment was chosen above.
- if (!(flags & TEXT_ALIGN_RIGHT))
+ // Align with forced content directionality, overriding alignment flags.
+ if (flags & FORCE_RTL_DIRECTIONALITY) {
+ flags &= ~(TEXT_ALIGN_CENTER | TEXT_ALIGN_LEFT);
+ flags |= TEXT_ALIGN_RIGHT;
+ } else if (flags & FORCE_LTR_DIRECTIONALITY) {
+ flags &= ~(TEXT_ALIGN_CENTER | TEXT_ALIGN_RIGHT);
flags |= TEXT_ALIGN_LEFT;
+ } else if (!(flags & TEXT_ALIGN_LEFT) && !(flags & TEXT_ALIGN_RIGHT)) {
+ // Also align with content directionality instead of fading both ends.
+ flags &= ~TEXT_ALIGN_CENTER;
+ const bool is_rtl = base::i18n::GetFirstStrongCharacterDirection(text) ==
+ base::i18n::RIGHT_TO_LEFT;
+ flags |= is_rtl ? TEXT_ALIGN_RIGHT : TEXT_ALIGN_LEFT;
+ }
+ flags |= NO_ELLIPSIS;
+ scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
Rect rect = display_rect;
UpdateRenderText(rect, text, font_list, flags, color, render_text.get());
-
- const int line_height = render_text->GetStringSize().height();
- // Center the text vertically.
- rect += Vector2d(0, (display_rect.height() - line_height) / 2);
- rect.set_height(line_height);
- render_text->SetDisplayRect(rect);
+ render_text->SetElideBehavior(FADE_TAIL);
canvas_->save();
ClipRect(display_rect);
projects / platform / framework / web / crosswalk.git / blobdiff