Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(926)

Unified Diff: views/examples/textfield_example.cc

Issue 7458014: Implement Uniscribe RenderText for Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Seek parity with RenderTextLinux, nix tentative word breaking, address comments. Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: views/examples/textfield_example.cc
diff --git a/views/examples/textfield_example.cc b/views/examples/textfield_example.cc
index bb1ab24a6a178895edcc5d9fef4d4d2e6d375c48..af0f2b9056eb1ba6c2f55f5dcd1f644d83d0e4ad 100644
--- a/views/examples/textfield_example.cc
+++ b/views/examples/textfield_example.cc
@@ -90,22 +90,27 @@ void TextfieldExample::ButtonPressed(views::Button* sender,
} else if (sender == set_) {
name_->SetText(WideToUTF16(L"[set]"));
} else if (sender == set_style_) {
- gfx::StyleRange color;
- color.foreground = SK_ColorYELLOW;
- color.range = ui::Range(0, 11);
- name_->ApplyStyleRange(color);
+ if (!name_->text().empty()) {
+ gfx::StyleRange color;
+ color.foreground = SK_ColorYELLOW;
+ color.range = ui::Range(0, name_->text().length());
+ name_->ApplyStyleRange(color);
- gfx::StyleRange underline;
- underline.underline = true;
- underline.foreground = SK_ColorBLUE;
- underline.range = ui::Range(1, 7);
- name_->ApplyStyleRange(underline);
+ if (name_->text().length() >= 5) {
+ size_t fifth = name_->text().length() / 5;
+ gfx::StyleRange underline;
+ underline.underline = true;
+ underline.foreground = SK_ColorBLUE;
+ underline.range = ui::Range(1 * fifth, 4 * fifth);
+ name_->ApplyStyleRange(underline);
- gfx::StyleRange strike;
- strike.strike = true;
- strike.foreground = SK_ColorRED;
- strike.range = ui::Range(6, 9);
- name_->ApplyStyleRange(strike);
+ gfx::StyleRange strike;
+ strike.strike = true;
+ strike.foreground = SK_ColorRED;
+ strike.range = ui::Range(2 * fifth, 3 * fifth);
+ name_->ApplyStyleRange(strike);
+ }
+ }
}
}

Powered by Google App Engine
This is Rietveld 408576698