diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-06 03:34:12 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-06 03:34:12 +0000 |
| commit | ff1af58133f464388b7ad8d8b98548626e153986 (patch) | |
| tree | 0b043cbb7a9d0c7881ff2b2d4396d7fd1db924bb /ui/views/examples/text_example.cc | |
| parent | 7a2629501b80866149a3ddba0903051e57af4c8c (diff) | |
| download | chromium_src-ff1af58133f464388b7ad8d8b98548626e153986.zip chromium_src-ff1af58133f464388b7ad8d8b98548626e153986.tar.gz chromium_src-ff1af58133f464388b7ad8d8b98548626e153986.tar.bz2 | |
Remove unused custom vertical text alignment in CanvasSkia.
This feature is unused in production code.
Nix gfx::Canvas::TEXT_VALIGN_[TOP|MIDDLE|BOTTOM] flags.
Simplify CanvasSkia vertical aligment; inline VAlignText.
Simplify pango_util; inline AdjustTextRectBasedOnLayout.
Remove TextExample vertical alignment combobox, etc.
BUG=none
TEST=No behavior changes.
R=sky@chromium.org,asvitkine@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11362070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/examples/text_example.cc')
| -rw-r--r-- | ui/views/examples/text_example.cc | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc index e6298e2..5fb6662 100644 --- a/ui/views/examples/text_example.cc +++ b/ui/views/examples/text_example.cc @@ -68,13 +68,6 @@ const char* kHorizontalAligments[] = { "Right", }; -const char* kVerticalAlignments[] = { - "Default", - "Top", - "Middle", - "Bottom", -}; - // Toggles bit |flag| on |flags| based on state of |checkbox|. void SetFlagFromCheckbox(Checkbox* checkbox, int* flags, int flag) { if (checkbox->checked()) @@ -222,10 +215,6 @@ void TextExample::CreateExampleView(View* container) { "H-Align", kHorizontalAligments, arraysize(kHorizontalAligments)); - v_align_cb_ = AddCombobox(layout, - "V-Align", - kVerticalAlignments, - arraysize(kVerticalAlignments)); eliding_cb_ = AddCombobox(layout, "Eliding", kElidingBehaviors, @@ -293,23 +282,6 @@ void TextExample::OnSelectedIndexChanged(Combobox* combobox) { text_flags |= gfx::Canvas::TEXT_ALIGN_RIGHT; break; } - } else if (combobox == v_align_cb_) { - text_flags &= ~(gfx::Canvas::TEXT_VALIGN_TOP | - gfx::Canvas::TEXT_VALIGN_MIDDLE | - gfx::Canvas::TEXT_VALIGN_BOTTOM); - switch (combobox->selected_index()) { - case 0: - break; - case 1: - text_flags |= gfx::Canvas::TEXT_VALIGN_TOP; - break; - case 2: - text_flags |= gfx::Canvas::TEXT_VALIGN_MIDDLE; - break; - case 3: - text_flags |= gfx::Canvas::TEXT_VALIGN_BOTTOM; - break; - } } else if (combobox == text_cb_) { switch (combobox->selected_index()) { case 0: |