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

Unified Diff: ui/views/examples/text_example.cc

Issue 354963003: Move gfx::ElideText functionality to RenderText. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync and rebase. Created 6 years, 5 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
« no previous file with comments | « ui/views/examples/label_example.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/text_example.cc
diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc
index 2682e73bd1400275365bef430fc41946803d1a2b..31764850901a5feeef79a3c56fb378c5b2e43c04 100644
--- a/ui/views/examples/text_example.cc
+++ b/ui/views/examples/text_example.cc
@@ -46,7 +46,7 @@ const wchar_t kRightToLeftText[] =
L"\x5e9\x5dc\x5d5\x5dd \x5d4\x5e2\x5d5\x5dc\x5dd!";
const char* kTextExamples[] = { "Short", "Long", "Ampersands", "RTL Hebrew", };
-const char* kElideBehaviors[] = { "Elide", "Truncate", "Fade", };
+const char* kElideBehaviors[] = { "Elide", "No Elide", "Fade", };
const char* kPrefixOptions[] = { "Default", "Show", "Hide", };
const char* kHorizontalAligments[] = { "Default", "Left", "Center", "Right", };
@@ -67,7 +67,7 @@ class TextExample::TextExampleView : public View {
: text_(base::ASCIIToUTF16(kShortText)),
flags_(0),
halo_(false),
- elide_(gfx::TRUNCATE) {
+ elide_(gfx::NO_ELIDE) {
}
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
@@ -239,7 +239,7 @@ void TextExample::OnPerformAction(Combobox* combobox) {
text_view_->set_elide(gfx::ELIDE_TAIL);
break;
case 1:
- text_view_->set_elide(gfx::TRUNCATE);
+ text_view_->set_elide(gfx::NO_ELIDE);
break;
case 2:
text_view_->set_elide(gfx::FADE_TAIL);
« no previous file with comments | « ui/views/examples/label_example.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698