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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/controls/label_unittest.cc

Issue 14654018: Make Label's NO_ELIDE setting actually not elide, and change the default (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 7 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
« ui/views/controls/label.h ('K') | « ui/views/controls/label.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/label_unittest.cc
===================================================================
--- ui/views/controls/label_unittest.cc (revision 200651)
+++ ui/views/controls/label_unittest.cc (working copy)
@@ -304,8 +304,9 @@
gfx::Rect text_bounds;
int flags;
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- EXPECT_EQ(gfx::Canvas::FORCE_RTL_DIRECTIONALITY |
- gfx::Canvas::TEXT_ALIGN_CENTER, flags);
+ EXPECT_EQ(gfx::Canvas::FORCE_RTL_DIRECTIONALITY,
+ flags & (gfx::Canvas::FORCE_RTL_DIRECTIONALITY |
+ gfx::Canvas::FORCE_LTR_DIRECTIONALITY));
// Test text starts with LTR character.
test_text = (WideToUTF16(L"ltr \x5d0\x5d1\x5d2 abc"));
@@ -317,8 +318,9 @@
required_size.height() + extra.height());
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY |
- gfx::Canvas::TEXT_ALIGN_CENTER, flags);
+ EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY,
+ flags & (gfx::Canvas::FORCE_RTL_DIRECTIONALITY |
+ gfx::Canvas::FORCE_LTR_DIRECTIONALITY));
}
TEST(LabelTest, DrawSingleLineString) {
@@ -351,8 +353,10 @@
EXPECT_EQ(extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY |
- gfx::Canvas::TEXT_ALIGN_CENTER, flags);
+ EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
+ flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
+ gfx::Canvas::TEXT_ALIGN_CENTER |
+ gfx::Canvas::TEXT_ALIGN_RIGHT));
// Left aligned text.
label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ -365,8 +369,10 @@
EXPECT_EQ(extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY |
- gfx::Canvas::TEXT_ALIGN_LEFT, flags);
+ EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
+ flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
+ gfx::Canvas::TEXT_ALIGN_CENTER |
+ gfx::Canvas::TEXT_ALIGN_RIGHT));
// Right aligned text.
label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
@@ -379,8 +385,10 @@
EXPECT_EQ(extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY |
- gfx::Canvas::TEXT_ALIGN_RIGHT, flags);
+ EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
+ flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
+ gfx::Canvas::TEXT_ALIGN_CENTER |
+ gfx::Canvas::TEXT_ALIGN_RIGHT));
// Test single line drawing with a border.
gfx::Insets border(39, 34, 8, 96);
@@ -410,8 +418,10 @@
EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY |
- gfx::Canvas::TEXT_ALIGN_CENTER, flags);
+ EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
+ flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
+ gfx::Canvas::TEXT_ALIGN_CENTER |
+ gfx::Canvas::TEXT_ALIGN_RIGHT));
// Left aligned text with border.
label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ -424,8 +434,10 @@
EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY |
- gfx::Canvas::TEXT_ALIGN_LEFT, flags);
+ EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
+ flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
+ gfx::Canvas::TEXT_ALIGN_CENTER |
+ gfx::Canvas::TEXT_ALIGN_RIGHT));
// Right aligned text.
label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
@@ -438,8 +450,10 @@
EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY |
- gfx::Canvas::TEXT_ALIGN_RIGHT, flags);
+ EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
+ flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
+ gfx::Canvas::TEXT_ALIGN_CENTER |
+ gfx::Canvas::TEXT_ALIGN_RIGHT));
}
// On Linux the underlying pango routines require a max height in order to
@@ -615,7 +629,10 @@
EXPECT_EQ(extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER, flags);
+ EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
+ flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
+ gfx::Canvas::TEXT_ALIGN_CENTER |
+ gfx::Canvas::TEXT_ALIGN_RIGHT));
// ALIGN_LEFT label.
label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ -628,7 +645,10 @@
EXPECT_EQ(extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT, flags);
+ EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
+ flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
+ gfx::Canvas::TEXT_ALIGN_CENTER |
+ gfx::Canvas::TEXT_ALIGN_RIGHT));
// ALIGN_RIGHT label.
label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
@@ -641,7 +661,10 @@
EXPECT_EQ(extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT, flags);
+ EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
+ flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
+ gfx::Canvas::TEXT_ALIGN_CENTER |
+ gfx::Canvas::TEXT_ALIGN_RIGHT));
// Test single line drawing with a border.
@@ -672,7 +695,10 @@
EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER, flags);
+ EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
+ flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
+ gfx::Canvas::TEXT_ALIGN_CENTER |
+ gfx::Canvas::TEXT_ALIGN_RIGHT));
// ALIGN_LEFT text with border.
label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ -685,7 +711,10 @@
EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT, flags);
+ EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
+ flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
+ gfx::Canvas::TEXT_ALIGN_CENTER |
+ gfx::Canvas::TEXT_ALIGN_RIGHT));
// ALIGN_RIGHT text.
label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
@@ -698,7 +727,10 @@
EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT, flags);
+ EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
+ flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
+ gfx::Canvas::TEXT_ALIGN_CENTER |
+ gfx::Canvas::TEXT_ALIGN_RIGHT));
// Reset locale.
base::i18n::SetICUDefaultLocale(locale);
« ui/views/controls/label.h ('K') | « ui/views/controls/label.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698