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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 585053002: Use RenderText vertical centering on Label and CanvasSkia text. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update LabelTest expectations. Created 6 years, 3 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/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
diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc
index 442794560ddbc615bc0d8d0cff449a59c5dedeb1..b60a7b9264fdbad3439dfb4c98916276af553479 100644
--- a/ui/views/controls/label_unittest.cc
+++ b/ui/views/controls/label_unittest.cc
@@ -378,9 +378,9 @@ TEST_F(LabelTest, DrawSingleLineString) {
EXPECT_EQ(label.text(), paint_text);
// The text should be centered horizontally and vertically.
EXPECT_EQ(extra.width() / 2, text_bounds.x());
- EXPECT_EQ(extra.height() / 2 , text_bounds.y());
+ EXPECT_EQ(0, text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
+ EXPECT_EQ(label.height(), text_bounds.height());
EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
gfx::Canvas::TEXT_ALIGN_CENTER |
@@ -394,9 +394,9 @@ TEST_F(LabelTest, DrawSingleLineString) {
EXPECT_EQ(label.text(), paint_text);
// The text should be left aligned horizontally and centered vertically.
EXPECT_EQ(0, text_bounds.x());
- EXPECT_EQ(extra.height() / 2 , text_bounds.y());
+ EXPECT_EQ(0, text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
+ EXPECT_EQ(label.height(), text_bounds.height());
EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
gfx::Canvas::TEXT_ALIGN_CENTER |
@@ -410,9 +410,9 @@ TEST_F(LabelTest, DrawSingleLineString) {
EXPECT_EQ(label.text(), paint_text);
// The text should be right aligned horizontally and centered vertically.
EXPECT_EQ(extra.width(), text_bounds.x());
- EXPECT_EQ(extra.height() / 2 , text_bounds.y());
+ EXPECT_EQ(0, text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
+ EXPECT_EQ(label.height(), text_bounds.height());
EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
gfx::Canvas::TEXT_ALIGN_CENTER |
@@ -439,9 +439,9 @@ TEST_F(LabelTest, DrawSingleLineString) {
EXPECT_EQ(label.text(), paint_text);
// The text should be centered horizontally and vertically within the border.
EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x());
- EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
+ EXPECT_EQ(border.top(), text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
+ EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height());
EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
gfx::Canvas::TEXT_ALIGN_CENTER |
@@ -455,9 +455,9 @@ TEST_F(LabelTest, DrawSingleLineString) {
EXPECT_EQ(label.text(), paint_text);
// The text should be left aligned horizontally and centered vertically.
EXPECT_EQ(border.left(), text_bounds.x());
- EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
+ EXPECT_EQ(border.top(), text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
+ EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height());
EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
gfx::Canvas::TEXT_ALIGN_CENTER |
@@ -471,9 +471,9 @@ TEST_F(LabelTest, DrawSingleLineString) {
EXPECT_EQ(label.text(), paint_text);
// The text should be right aligned horizontally and centered vertically.
EXPECT_EQ(border.left() + extra.width(), text_bounds.x());
- EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
+ EXPECT_EQ(border.top(), text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
+ EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height());
EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
gfx::Canvas::TEXT_ALIGN_CENTER |
@@ -502,9 +502,9 @@ TEST_F(LabelTest, DrawMultiLineString) {
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
EXPECT_EQ(label.text(), paint_text);
EXPECT_EQ(extra.width() / 2, text_bounds.x());
- EXPECT_EQ(extra.height() / 2, text_bounds.y());
+ EXPECT_EQ(0, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_GT(text_bounds.height(), kMinTextDimension);
+ EXPECT_EQ(text_bounds.height(), label.height());
int expected_flags = gfx::Canvas::MULTI_LINE |
gfx::Canvas::TEXT_ALIGN_CENTER |
gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
@@ -520,9 +520,9 @@ TEST_F(LabelTest, DrawMultiLineString) {
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
EXPECT_EQ(label.text(), paint_text);
EXPECT_EQ(0, text_bounds.x());
- EXPECT_EQ(extra.height() / 2, text_bounds.y());
+ EXPECT_EQ(0, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_GT(text_bounds.height(), kMinTextDimension);
+ EXPECT_EQ(text_bounds.height(), label.height());
expected_flags = gfx::Canvas::MULTI_LINE |
gfx::Canvas::TEXT_ALIGN_LEFT |
gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
@@ -537,9 +537,9 @@ TEST_F(LabelTest, DrawMultiLineString) {
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
EXPECT_EQ(label.text(), paint_text);
EXPECT_EQ(extra.width(), text_bounds.x());
- EXPECT_EQ(extra.height() / 2, text_bounds.y());
+ EXPECT_EQ(0, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_GT(text_bounds.height(), kMinTextDimension);
+ EXPECT_EQ(text_bounds.height(), label.height());
expected_flags = gfx::Canvas::MULTI_LINE |
gfx::Canvas::TEXT_ALIGN_RIGHT |
gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
@@ -563,7 +563,7 @@ TEST_F(LabelTest, DrawMultiLineString) {
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
EXPECT_EQ(label.text(), paint_text);
EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x());
- EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
+ EXPECT_EQ(border.top(), text_bounds.y());
EXPECT_EQ(center_bounds.width(), text_bounds.width());
EXPECT_EQ(center_bounds.height(), text_bounds.height());
expected_flags = gfx::Canvas::MULTI_LINE |
@@ -580,7 +580,7 @@ TEST_F(LabelTest, DrawMultiLineString) {
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
EXPECT_EQ(label.text(), paint_text);
EXPECT_EQ(border.left(), text_bounds.x());
- EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
+ EXPECT_EQ(border.top(), text_bounds.y());
EXPECT_EQ(center_bounds.width(), text_bounds.width());
EXPECT_EQ(center_bounds.height(), text_bounds.height());
expected_flags = gfx::Canvas::MULTI_LINE |
@@ -597,7 +597,7 @@ TEST_F(LabelTest, DrawMultiLineString) {
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
EXPECT_EQ(label.text(), paint_text);
EXPECT_EQ(extra.width() + border.left(), text_bounds.x());
- EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
+ EXPECT_EQ(border.top(), text_bounds.y());
EXPECT_EQ(center_bounds.width(), text_bounds.width());
EXPECT_EQ(center_bounds.height(), text_bounds.height());
expected_flags = gfx::Canvas::MULTI_LINE |
@@ -632,9 +632,9 @@ TEST_F(LabelTest, DrawSingleLineStringInRTL) {
EXPECT_EQ(label.text(), paint_text);
// The text should be centered horizontally and vertically.
EXPECT_EQ(extra.width() / 2, text_bounds.x());
- EXPECT_EQ(extra.height() / 2 , text_bounds.y());
+ EXPECT_EQ(0, text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
+ EXPECT_EQ(label.height(), text_bounds.height());
EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
gfx::Canvas::TEXT_ALIGN_CENTER |
@@ -648,9 +648,9 @@ TEST_F(LabelTest, DrawSingleLineStringInRTL) {
EXPECT_EQ(label.text(), paint_text);
// The text should be right aligned horizontally and centered vertically.
EXPECT_EQ(extra.width(), text_bounds.x());
- EXPECT_EQ(extra.height() / 2 , text_bounds.y());
+ EXPECT_EQ(0, text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
+ EXPECT_EQ(label.height(), text_bounds.height());
EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
gfx::Canvas::TEXT_ALIGN_CENTER |
@@ -664,9 +664,9 @@ TEST_F(LabelTest, DrawSingleLineStringInRTL) {
EXPECT_EQ(label.text(), paint_text);
// The text should be left aligned horizontally and centered vertically.
EXPECT_EQ(0, text_bounds.x());
- EXPECT_EQ(extra.height() / 2 , text_bounds.y());
+ EXPECT_EQ(0, text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
+ EXPECT_EQ(label.height(), text_bounds.height());
EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
gfx::Canvas::TEXT_ALIGN_CENTER |
@@ -694,9 +694,9 @@ TEST_F(LabelTest, DrawSingleLineStringInRTL) {
EXPECT_EQ(label.text(), paint_text);
// The text should be centered horizontally and vertically within the border.
EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x());
- EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
+ EXPECT_EQ(border.top(), text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
+ EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height());
EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
gfx::Canvas::TEXT_ALIGN_CENTER |
@@ -710,9 +710,9 @@ TEST_F(LabelTest, DrawSingleLineStringInRTL) {
EXPECT_EQ(label.text(), paint_text);
// The text should be right aligned horizontally and centered vertically.
EXPECT_EQ(border.left() + extra.width(), text_bounds.x());
- EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
+ EXPECT_EQ(border.top(), text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
+ EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height());
EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
gfx::Canvas::TEXT_ALIGN_CENTER |
@@ -726,9 +726,9 @@ TEST_F(LabelTest, DrawSingleLineStringInRTL) {
EXPECT_EQ(label.text(), paint_text);
// The text should be left aligned horizontally and centered vertically.
EXPECT_EQ(border.left(), text_bounds.x());
- EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
+ EXPECT_EQ(border.top(), text_bounds.y());
EXPECT_EQ(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
+ EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height());
EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
gfx::Canvas::TEXT_ALIGN_CENTER |
@@ -764,9 +764,9 @@ TEST_F(LabelTest, DrawMultiLineStringInRTL) {
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
EXPECT_EQ(label.text(), paint_text);
EXPECT_EQ(extra.width() / 2, text_bounds.x());
- EXPECT_EQ(extra.height() / 2, text_bounds.y());
+ EXPECT_EQ(0, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_GT(text_bounds.height(), kMinTextDimension);
+ EXPECT_EQ(text_bounds.height(), label.height());
EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_CENTER & flags);
#if !defined(OS_WIN)
@@ -780,9 +780,9 @@ TEST_F(LabelTest, DrawMultiLineStringInRTL) {
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
EXPECT_EQ(label.text(), paint_text);
EXPECT_EQ(extra.width(), text_bounds.x());
- EXPECT_EQ(extra.height() / 2, text_bounds.y());
+ EXPECT_EQ(0, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_GT(text_bounds.height(), kMinTextDimension);
+ EXPECT_EQ(text_bounds.height(), label.height());
EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_RIGHT & flags);
#if !defined(OS_WIN)
@@ -795,9 +795,9 @@ TEST_F(LabelTest, DrawMultiLineStringInRTL) {
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
EXPECT_EQ(label.text(), paint_text);
EXPECT_EQ(0, text_bounds.x());
- EXPECT_EQ(extra.height() / 2, text_bounds.y());
+ EXPECT_EQ(0, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_GT(text_bounds.height(), kMinTextDimension);
+ EXPECT_EQ(text_bounds.height(), label.height());
EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_LEFT & flags);
#if !defined(OS_WIN)
@@ -819,9 +819,9 @@ TEST_F(LabelTest, DrawMultiLineStringInRTL) {
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
EXPECT_EQ(label.text(), paint_text);
EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x());
- EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
+ EXPECT_EQ(border.top(), text_bounds.y());
EXPECT_EQ(center_bounds.width(), text_bounds.width());
- EXPECT_EQ(center_bounds.height(), text_bounds.height());
+ EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height());
EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_CENTER & flags);
#if !defined(OS_WIN)
@@ -834,9 +834,9 @@ TEST_F(LabelTest, DrawMultiLineStringInRTL) {
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
EXPECT_EQ(label.text(), paint_text);
EXPECT_EQ(border.left() + extra.width(), text_bounds.x());
- EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
+ EXPECT_EQ(border.top(), text_bounds.y());
EXPECT_EQ(center_bounds.width(), text_bounds.width());
- EXPECT_EQ(center_bounds.height(), text_bounds.height());
+ EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height());
EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_RIGHT & flags);
#if !defined(OS_WIN)
@@ -849,9 +849,9 @@ TEST_F(LabelTest, DrawMultiLineStringInRTL) {
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
EXPECT_EQ(label.text(), paint_text);
EXPECT_EQ(border.left(), text_bounds.x());
- EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
+ EXPECT_EQ(border.top(), text_bounds.y());
EXPECT_EQ(center_bounds.width(), text_bounds.width());
- EXPECT_EQ(center_bounds.height(), text_bounds.height());
+ EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height());
EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_LEFT & flags);
#if !defined(OS_WIN)
« no previous file with comments | « ui/views/controls/label.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698