diff options
| author | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 22:32:41 +0000 |
|---|---|---|
| committer | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 22:32:41 +0000 |
| commit | 7f8bd32d382cc3f1cd70670d40f5f96d69e5d6ea (patch) | |
| tree | d5d5b1722da43f55212e738d1333d2654923b75b /views/controls/label_unittest.cc | |
| parent | 1b0a2055ebe972b871ec3e5062ae33db72f6bf80 (diff) | |
| download | chromium_src-7f8bd32d382cc3f1cd70670d40f5f96d69e5d6ea.zip chromium_src-7f8bd32d382cc3f1cd70670d40f5f96d69e5d6ea.tar.gz chromium_src-7f8bd32d382cc3f1cd70670d40f5f96d69e5d6ea.tar.bz2 | |
Add highlight color support to label text.
BUG=none
TEST=--gtest_filter=LabelTest.*
Review URL: http://codereview.chromium.org/113466
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/label_unittest.cc')
| -rw-r--r-- | views/controls/label_unittest.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc index f9bb484..7f1ca60 100644 --- a/views/controls/label_unittest.cc +++ b/views/controls/label_unittest.cc @@ -45,6 +45,9 @@ TEST(LabelTest, ColorProperty) { SkColor color = SkColorSetARGB(20, 40, 10, 5); label.SetColor(color); EXPECT_EQ(color, label.GetColor()); + SkColor h_color = SkColorSetARGB(40, 80, 20, 10); + label.SetHighlightColor(h_color); + EXPECT_EQ(h_color, label.GetHighlightColor()); } TEST(LabelTest, AlignmentProperty) { @@ -169,6 +172,13 @@ TEST(LabelTest, SingleLineSizing) { EXPECT_GT(required_size.height(), kMinTextDimension); EXPECT_GT(required_size.width(), kMinTextDimension); + // Test with highlights. + label.SetDrawHighlighted(true); + gfx::Size highlighted_size = label.GetPreferredSize(); + EXPECT_GT(highlighted_size.height(), required_size.height()); + EXPECT_GT(highlighted_size.width(), required_size.width()); + label.SetDrawHighlighted(false); + // Test everything with borders. gfx::Insets border(10, 20, 30, 40); label.set_border(Border::CreateEmptyBorder(border.top(), |