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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 23228004: Prepare to use gfx::RenderText in views::Label. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix multiline LabelButton layout and sizing. 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
« ui/views/controls/label.cc ('K') | « ui/views/controls/label.cc ('k') | ui/views/controls/message_box_view.cc » ('j') | 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 acc9e075dd3946d46ab16b600cef901f9088593a..135d7262a3b74c266d87ecffc6361bd616cf7bb0 100644
--- a/ui/views/controls/label_unittest.cc
+++ b/ui/views/controls/label_unittest.cc
@@ -77,43 +77,31 @@ TEST_F(LabelTest, AlignmentProperty) {
// The alignment should be flipped in RTL UI.
label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
EXPECT_EQ(reverse_alignment ? gfx::ALIGN_LEFT : gfx::ALIGN_RIGHT,
- label.GetHorizontalAlignment());
+ label.horizontal_alignment());
label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
EXPECT_EQ(reverse_alignment ? gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT,
- label.GetHorizontalAlignment());
+ label.horizontal_alignment());
label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
- EXPECT_EQ(gfx::ALIGN_CENTER, label.GetHorizontalAlignment());
+ EXPECT_EQ(gfx::ALIGN_CENTER, label.horizontal_alignment());
for (size_t j = 0; j < 2; ++j) {
label.SetHorizontalAlignment(gfx::ALIGN_TO_HEAD);
const bool rtl = j == 0;
label.SetText(rtl ? base::WideToUTF16(L"\x5d0") : ASCIIToUTF16("A"));
- EXPECT_EQ(rtl ? gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT,
- label.GetHorizontalAlignment());
+ EXPECT_EQ(gfx::ALIGN_TO_HEAD, label.horizontal_alignment());
}
}
EXPECT_EQ(was_rtl, base::i18n::IsRTL());
}
-TEST_F(LabelTest, DirectionalityModeProperty) {
- Label label;
- EXPECT_EQ(gfx::DIRECTIONALITY_FROM_UI, label.directionality_mode());
-
- label.set_directionality_mode(gfx::DIRECTIONALITY_FROM_TEXT);
- EXPECT_EQ(gfx::DIRECTIONALITY_FROM_TEXT, label.directionality_mode());
-
- label.set_directionality_mode(gfx::DIRECTIONALITY_FROM_UI);
- EXPECT_EQ(gfx::DIRECTIONALITY_FROM_UI, label.directionality_mode());
-}
-
TEST_F(LabelTest, MultiLineProperty) {
Label label;
- EXPECT_FALSE(label.is_multi_line());
+ EXPECT_FALSE(label.multi_line());
label.SetMultiLine(true);
- EXPECT_TRUE(label.is_multi_line());
+ EXPECT_TRUE(label.multi_line());
label.SetMultiLine(false);
- EXPECT_FALSE(label.is_multi_line());
+ EXPECT_FALSE(label.multi_line());
}
TEST_F(LabelTest, ObscuredProperty) {
@@ -121,23 +109,24 @@ TEST_F(LabelTest, ObscuredProperty) {
base::string16 test_text(ASCIIToUTF16("Password!"));
label.SetText(test_text);
- // Should be false by default...
- EXPECT_FALSE(label.is_obscured());
- EXPECT_EQ(test_text, label.layout_text());
+ // The text should be unobscured by default.
+ EXPECT_FALSE(label.obscured());
+ EXPECT_EQ(test_text, label.GetLayoutTextForTesting());
EXPECT_EQ(test_text, label.text());
label.SetObscured(true);
- EXPECT_TRUE(label.is_obscured());
- EXPECT_EQ(ASCIIToUTF16("*********"), label.layout_text());
+ EXPECT_TRUE(label.obscured());
+ EXPECT_EQ(ASCIIToUTF16("*********"), label.GetLayoutTextForTesting());
EXPECT_EQ(test_text, label.text());
label.SetText(test_text + test_text);
- EXPECT_EQ(ASCIIToUTF16("******************"), label.layout_text());
+ EXPECT_EQ(ASCIIToUTF16("******************"),
+ label.GetLayoutTextForTesting());
EXPECT_EQ(test_text + test_text, label.text());
label.SetObscured(false);
- EXPECT_FALSE(label.is_obscured());
- EXPECT_EQ(test_text + test_text, label.layout_text());
+ EXPECT_FALSE(label.obscured());
+ EXPECT_EQ(test_text + test_text, label.GetLayoutTextForTesting());
EXPECT_EQ(test_text + test_text, label.text());
}
@@ -149,7 +138,7 @@ TEST_F(LabelTest, ObscuredSurrogatePair) {
label.SetText(test_text);
label.SetObscured(true);
- EXPECT_EQ(ASCIIToUTF16("*"), label.layout_text());
+ EXPECT_EQ(ASCIIToUTF16("*"), label.GetLayoutTextForTesting());
EXPECT_EQ(test_text, label.text());
}
@@ -194,8 +183,12 @@ TEST_F(LabelTest, TooltipProperty) {
label.SetObscured(false);
EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
- // Make the label multiline and there is no tooltip.
+ // Making the label multiline shouldn't eliminate the tooltip.
label.SetMultiLine(true);
+ EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
+
+ // Expanding the multiline label bounds should eliminate the tooltip.
+ label.SetBounds(0, 0, 1000, 1000);
EXPECT_FALSE(label.GetTooltipText(gfx::Point(), &tooltip));
// Verify that setting the tooltip still shows it.
@@ -220,24 +213,19 @@ TEST_F(LabelTest, Accessibility) {
TEST_F(LabelTest, SingleLineSizing) {
Label label;
label.SetText(ASCIIToUTF16("A not so random string in one line."));
-
- // GetPreferredSize
- gfx::Size required_size = label.GetPreferredSize();
- EXPECT_GT(required_size.height(), kMinTextDimension);
- EXPECT_GT(required_size.width(), kMinTextDimension);
-
- // Test everything with borders.
- gfx::Insets border(10, 20, 30, 40);
+ const gfx::Size size = label.GetPreferredSize();
+ EXPECT_GT(size.height(), kMinTextDimension);
+ EXPECT_GT(size.width(), kMinTextDimension);
+ // Setting a size smaller than preferred should not change the preferred size.
+ label.SetSize(gfx::Size(size.width() / 2, size.height() / 2));
+ EXPECT_EQ(size, label.GetPreferredSize());
+
+ const gfx::Insets border(10, 20, 30, 40);
label.SetBorder(Border::CreateEmptyBorder(
border.top(), border.left(), border.bottom(), border.right()));
-
- // GetPreferredSize and borders.
- label.SetBounds(0, 0, 0, 0);
- gfx::Size required_size_with_border = label.GetPreferredSize();
- EXPECT_EQ(required_size_with_border.height(),
- required_size.height() + border.height());
- EXPECT_EQ(required_size_with_border.width(),
- required_size.width() + border.width());
+ const gfx::Size size_with_border = label.GetPreferredSize();
+ EXPECT_EQ(size_with_border.height(), size.height() + border.height());
+ EXPECT_EQ(size_with_border.width(), size.width() + border.width());
}
TEST_F(LabelTest, MultilineSmallAvailableWidthSizing) {
@@ -335,552 +323,6 @@ TEST_F(LabelTest, MultiLineSizing) {
required_size.width() + border.width());
}
-TEST_F(LabelTest, DirectionalityFromText) {
- Label label;
- label.set_directionality_mode(gfx::DIRECTIONALITY_FROM_TEXT);
- label.SetBounds(0, 0, 1000, 1000);
- base::string16 paint_text;
- gfx::Rect text_bounds;
- int flags = -1;
-
- // Test text starts with RTL character.
- label.SetText(base::WideToUTF16(L" \x5d0\x5d1\x5d2 abc"));
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &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.
- label.SetText(base::WideToUTF16(L"ltr \x5d0\x5d1\x5d2 abc"));
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY,
- flags & (gfx::Canvas::FORCE_RTL_DIRECTIONALITY |
- gfx::Canvas::FORCE_LTR_DIRECTIONALITY));
-}
-
-TEST_F(LabelTest, DrawSingleLineString) {
- Label label;
- label.SetFocusable(false);
- // Force a directionality to simplify alignment value testing.
- label.set_directionality_mode(gfx::DIRECTIONALITY_FORCE_LTR);
-
- label.SetText(ASCIIToUTF16("Here's a string with no returns."));
- gfx::Size required_size(label.GetPreferredSize());
- gfx::Size extra(22, 8);
- label.SetBounds(0, 0, required_size.width() + extra.width(),
- required_size.height() + extra.height());
-
- // Do some basic verifications for all three alignments.
- base::string16 paint_text;
- gfx::Rect text_bounds;
- int flags = -1;
-
- // Centered text.
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- 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(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
- 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);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- 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(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
- 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);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- 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(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
- 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);
- label.SetBorder(Border::CreateEmptyBorder(
- border.top(), border.left(), border.bottom(), border.right()));
-
- gfx::Size required_size_with_border(label.GetPreferredSize());
- EXPECT_EQ(required_size.width() + border.width(),
- required_size_with_border.width());
- EXPECT_EQ(required_size.height() + border.height(),
- required_size_with_border.height());
- label.SetBounds(0, 0, required_size_with_border.width() + extra.width(),
- required_size_with_border.height() + extra.height());
-
- // Centered text with border.
- label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- 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(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
- 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);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- 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(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
- 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);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- 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(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
- EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
- flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
- gfx::Canvas::TEXT_ALIGN_CENTER |
- gfx::Canvas::TEXT_ALIGN_RIGHT));
-}
-
-// Pango needs a max height to elide multiline text; that is not supported here.
-TEST_F(LabelTest, DrawMultiLineString) {
- Label label;
- label.SetFocusable(false);
- // Force a directionality to simplify alignment value testing.
- label.set_directionality_mode(gfx::DIRECTIONALITY_FORCE_LTR);
- // Set a background color to prevent gfx::Canvas::NO_SUBPIXEL_RENDERING flags.
- label.SetBackgroundColor(SK_ColorWHITE);
-
- label.SetText(ASCIIToUTF16("Another string\nwith returns\n\n!"));
- label.SetMultiLine(true);
- label.SizeToFit(0);
- gfx::Size extra(50, 10);
- label.SetBounds(label.x(), label.y(),
- label.width() + extra.width(),
- label.height() + extra.height());
-
- // Do some basic verifications for all three alignments.
- base::string16 paint_text;
- gfx::Rect text_bounds;
- int flags = -1;
- 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_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_GT(text_bounds.height(), kMinTextDimension);
- int expected_flags = gfx::Canvas::MULTI_LINE |
- gfx::Canvas::TEXT_ALIGN_CENTER |
- gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-#if !defined(OS_WIN)
- expected_flags |= gfx::Canvas::NO_ELLIPSIS;
-#endif
- EXPECT_EQ(expected_flags, expected_flags);
- gfx::Rect center_bounds(text_bounds);
-
- label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- 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_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_GT(text_bounds.height(), kMinTextDimension);
- expected_flags = gfx::Canvas::MULTI_LINE |
- gfx::Canvas::TEXT_ALIGN_LEFT |
- gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-#if !defined(OS_WIN)
- expected_flags |= gfx::Canvas::NO_ELLIPSIS;
-#endif
- EXPECT_EQ(expected_flags, expected_flags);
-
- label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- 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_GT(text_bounds.width(), kMinTextDimension);
- EXPECT_GT(text_bounds.height(), kMinTextDimension);
- expected_flags = gfx::Canvas::MULTI_LINE |
- gfx::Canvas::TEXT_ALIGN_RIGHT |
- gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-#if !defined(OS_WIN)
- expected_flags |= gfx::Canvas::NO_ELLIPSIS;
-#endif
- EXPECT_EQ(expected_flags, expected_flags);
-
- // Test multiline drawing with a border.
- gfx::Insets border(19, 92, 23, 2);
- label.SetBorder(Border::CreateEmptyBorder(
- border.top(), border.left(), border.bottom(), border.right()));
- label.SizeToFit(0);
- label.SetBounds(label.x(), label.y(),
- label.width() + extra.width(),
- label.height() + extra.height());
-
- label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- 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(center_bounds.width(), text_bounds.width());
- EXPECT_EQ(center_bounds.height(), text_bounds.height());
- expected_flags = gfx::Canvas::MULTI_LINE |
- gfx::Canvas::TEXT_ALIGN_CENTER |
- gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-#if !defined(OS_WIN)
- expected_flags |= gfx::Canvas::NO_ELLIPSIS;
-#endif
- EXPECT_EQ(expected_flags, expected_flags);
-
- label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- 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(center_bounds.width(), text_bounds.width());
- EXPECT_EQ(center_bounds.height(), text_bounds.height());
- expected_flags = gfx::Canvas::MULTI_LINE |
- gfx::Canvas::TEXT_ALIGN_LEFT |
- gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-#if !defined(OS_WIN)
- expected_flags |= gfx::Canvas::NO_ELLIPSIS;
-#endif
- EXPECT_EQ(expected_flags, expected_flags);
-
- label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- 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(center_bounds.width(), text_bounds.width());
- EXPECT_EQ(center_bounds.height(), text_bounds.height());
- expected_flags = gfx::Canvas::MULTI_LINE |
- gfx::Canvas::TEXT_ALIGN_RIGHT |
- gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-#if !defined(OS_WIN)
- expected_flags |= gfx::Canvas::NO_ELLIPSIS;
-#endif
- EXPECT_EQ(expected_flags, expected_flags);
-}
-
-TEST_F(LabelTest, DrawSingleLineStringInRTL) {
- Label label;
- label.SetFocusable(false);
-
- std::string locale = l10n_util::GetApplicationLocale("");
- base::i18n::SetICUDefaultLocale("he");
-
- label.SetText(ASCIIToUTF16("Here's a string with no returns."));
- gfx::Size required_size(label.GetPreferredSize());
- gfx::Size extra(22, 8);
- label.SetBounds(0, 0, required_size.width() + extra.width(),
- required_size.height() + extra.height());
-
- // Do some basic verifications for all three alignments.
- base::string16 paint_text;
- gfx::Rect text_bounds;
- int flags = -1;
-
- // Centered text.
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- 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(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
- 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);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- 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(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
- 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);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- 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(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
- 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.
- gfx::Insets border(39, 34, 8, 96);
- label.SetBorder(Border::CreateEmptyBorder(
- border.top(), border.left(), border.bottom(), border.right()));
-
- gfx::Size required_size_with_border(label.GetPreferredSize());
- EXPECT_EQ(required_size.width() + border.width(),
- required_size_with_border.width());
- EXPECT_EQ(required_size.height() + border.height(),
- required_size_with_border.height());
- label.SetBounds(0, 0, required_size_with_border.width() + extra.width(),
- required_size_with_border.height() + extra.height());
-
- // Centered text with border.
- label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- 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(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
- 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);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- 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(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
- 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);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
- 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(required_size.width(), text_bounds.width());
- EXPECT_EQ(required_size.height(), text_bounds.height());
- 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);
-}
-
-// On Linux the underlying pango routines require a max height in order to
-// ellide multiline text. So until that can be resolved, we set all
-// multiline lables to not ellide in Linux only.
-TEST_F(LabelTest, DrawMultiLineStringInRTL) {
- Label label;
- label.SetFocusable(false);
-
- // Test for RTL.
- std::string locale = l10n_util::GetApplicationLocale("");
- base::i18n::SetICUDefaultLocale("he");
-
- label.SetText(ASCIIToUTF16("Another string\nwith returns\n\n!"));
- label.SetMultiLine(true);
- label.SizeToFit(0);
- gfx::Size extra(50, 10);
- label.SetBounds(label.x(), label.y(),
- label.width() + extra.width(),
- label.height() + extra.height());
-
- // Do some basic verifications for all three alignments.
- base::string16 paint_text;
- gfx::Rect text_bounds;
- int flags = -1;
- 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_GT(text_bounds.width(), kMinTextDimension);
- 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)
- EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags);
-#endif
- gfx::Rect center_bounds(text_bounds);
-
- label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- 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_GT(text_bounds.width(), kMinTextDimension);
- 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)
- EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags);
-#endif
-
- label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- 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_GT(text_bounds.width(), kMinTextDimension);
- 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)
- EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags);
-#endif
-
- // Test multiline drawing with a border.
- gfx::Insets border(19, 92, 23, 2);
- label.SetBorder(Border::CreateEmptyBorder(
- border.top(), border.left(), border.bottom(), border.right()));
- label.SizeToFit(0);
- label.SetBounds(label.x(), label.y(),
- label.width() + extra.width(),
- label.height() + extra.height());
-
- label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- 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(center_bounds.width(), text_bounds.width());
- 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)
- EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags);
-#endif
-
- label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- 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(center_bounds.width(), text_bounds.width());
- 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)
- EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags);
-#endif
-
- label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
- paint_text.clear();
- text_bounds.SetRect(0, 0, 0, 0);
- 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(center_bounds.width(), text_bounds.width());
- 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)
- EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags);
-#endif
-
- // Reset Locale
- base::i18n::SetICUDefaultLocale(locale);
-}
-
-// Ensure the subpixel rendering flag and background color alpha are respected.
-TEST_F(LabelTest, DisableSubpixelRendering) {
- Label label;
- label.SetBackgroundColor(SK_ColorWHITE);
- const int flag = gfx::Canvas::NO_SUBPIXEL_RENDERING;
- EXPECT_EQ(0, label.ComputeDrawStringFlags() & flag);
- label.set_subpixel_rendering_enabled(false);
- EXPECT_EQ(flag, label.ComputeDrawStringFlags() & flag);
- label.set_subpixel_rendering_enabled(true);
- EXPECT_EQ(0, label.ComputeDrawStringFlags() & flag);
- // Text cannot be drawn with subpixel rendering on transparent backgrounds.
- label.SetBackgroundColor(SkColorSetARGB(64, 255, 255, 255));
- EXPECT_EQ(flag, label.ComputeDrawStringFlags() & flag);
-}
-
// Check that labels support GetTooltipHandlerForPoint.
TEST_F(LabelTest, GetTooltipHandlerForPoint) {
// A root view must be defined for this test because the hit-testing
« ui/views/controls/label.cc ('K') | « ui/views/controls/label.cc ('k') | ui/views/controls/message_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698