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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 712003005: Support vertical centering of multi-line labels. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update multi-line label unittests. Created 6 years, 1 month 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 076ec4648c96b42493316b49db9825fd33c98a57..3a99557ad7157438b613c830e8c955953b7af51a 100644
--- a/ui/views/controls/label_unittest.cc
+++ b/ui/views/controls/label_unittest.cc
@@ -523,9 +523,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(0, text_bounds.y());
+ EXPECT_EQ(extra.height() / 2, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_EQ(text_bounds.height(), label.height());
+ EXPECT_GT(text_bounds.height(), kMinTextDimension);
int expected_flags = gfx::Canvas::MULTI_LINE |
gfx::Canvas::TEXT_ALIGN_CENTER |
gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
@@ -541,9 +541,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(0, text_bounds.y());
+ EXPECT_EQ(extra.height() / 2, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_EQ(text_bounds.height(), label.height());
+ EXPECT_GT(text_bounds.height(), kMinTextDimension);
expected_flags = gfx::Canvas::MULTI_LINE |
gfx::Canvas::TEXT_ALIGN_LEFT |
gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
@@ -558,9 +558,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(0, text_bounds.y());
+ EXPECT_EQ(extra.height() / 2, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_EQ(text_bounds.height(), label.height());
+ EXPECT_GT(text_bounds.height(), kMinTextDimension);
expected_flags = gfx::Canvas::MULTI_LINE |
gfx::Canvas::TEXT_ALIGN_RIGHT |
gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
@@ -584,7 +584,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(), text_bounds.y());
+ EXPECT_EQ(border.top() + extra.height() / 2, 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 |
@@ -601,7 +601,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(), text_bounds.y());
+ EXPECT_EQ(border.top() + extra.height() / 2, 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 |
@@ -618,7 +618,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(), text_bounds.y());
+ EXPECT_EQ(border.top() + extra.height() / 2, 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 |
@@ -785,9 +785,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(0, text_bounds.y());
+ EXPECT_EQ(extra.height() / 2, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_EQ(text_bounds.height(), label.height());
+ EXPECT_GT(text_bounds.height(), kMinTextDimension);
EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_CENTER & flags);
#if !defined(OS_WIN)
@@ -801,9 +801,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(0, text_bounds.y());
+ EXPECT_EQ(extra.height() / 2, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_EQ(text_bounds.height(), label.height());
+ EXPECT_GT(text_bounds.height(), kMinTextDimension);
EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_RIGHT & flags);
#if !defined(OS_WIN)
@@ -816,9 +816,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(0, text_bounds.y());
+ EXPECT_EQ(extra.height() / 2, text_bounds.y());
EXPECT_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_EQ(text_bounds.height(), label.height());
+ EXPECT_GT(text_bounds.height(), kMinTextDimension);
EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_LEFT & flags);
#if !defined(OS_WIN)
@@ -840,9 +840,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(), text_bounds.y());
+ EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
EXPECT_EQ(center_bounds.width(), text_bounds.width());
- EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height());
+ EXPECT_EQ(center_bounds.height(), text_bounds.height());
EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_CENTER & flags);
#if !defined(OS_WIN)
@@ -855,9 +855,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(), text_bounds.y());
+ EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
EXPECT_EQ(center_bounds.width(), text_bounds.width());
- EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height());
+ EXPECT_EQ(center_bounds.height(), text_bounds.height());
EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_RIGHT & flags);
#if !defined(OS_WIN)
@@ -870,9 +870,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(), text_bounds.y());
+ EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
EXPECT_EQ(center_bounds.width(), text_bounds.width());
- EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height());
+ EXPECT_EQ(center_bounds.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