Chromium Code Reviews| Index: ui/views/examples/text_example.cc |
| diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc |
| index 8e295fb084eb0ec027e50c42c42d070350c2605e..e0fd1e26919171ac5de83e26f81e911a09ff32cb 100644 |
| --- a/ui/views/examples/text_example.cc |
| +++ b/ui/views/examples/text_example.cc |
| @@ -48,6 +48,12 @@ const char* kTextExamples[] = { "Short", "Long", "Ampersands", "RTL Hebrew", }; |
| const char* kElideBehaviors[] = { "Elide", "No Elide", "Fade", }; |
| const char* kPrefixOptions[] = { "Default", "Show", "Hide", }; |
| const char* kHorizontalAligments[] = { "Default", "Left", "Center", "Right", }; |
| +const char* kVerticalAligments[] = { |
|
msw
2015/04/01 15:07:18
optional nit: defy git-cl-format and fit this on o
|
| + "Default", |
| + "Top", |
| + "Middle", |
| + "Bottom", |
| +}; |
| // Toggles bit |flag| on |flags| based on state of |checkbox|. |
| void SetFlagFromCheckbox(Checkbox* checkbox, int* flags, int flag) { |
| @@ -158,6 +164,8 @@ void TextExample::CreateExampleView(View* container) { |
| h_align_cb_ = AddCombobox(layout, "H-Align", kHorizontalAligments, |
| arraysize(kHorizontalAligments)); |
| + v_align_cb_ = AddCombobox(layout, "V-Align", kVerticalAligments, |
| + arraysize(kVerticalAligments)); |
| eliding_cb_ = AddCombobox(layout, "Eliding", kElideBehaviors, |
| arraysize(kElideBehaviors)); |
| prefix_cb_ = AddCombobox(layout, "Prefix", kPrefixOptions, |
| @@ -217,6 +225,22 @@ void TextExample::OnPerformAction(Combobox* combobox) { |
| flags |= gfx::Canvas::TEXT_ALIGN_RIGHT; |
| break; |
| } |
| + } else if (combobox == v_align_cb_) { |
| + flags &= ~(gfx::Canvas::TEXT_ALIGN_TOP | gfx::Canvas::TEXT_ALIGN_MIDDLE | |
| + gfx::Canvas::TEXT_ALIGN_BOTTOM); |
| + switch (combobox->selected_index()) { |
| + case 0: |
| + break; |
| + case 1: |
| + flags |= gfx::Canvas::TEXT_ALIGN_TOP; |
|
msw
2015/04/01 15:07:18
Ah, I see why you added the canvas flags now... It
|
| + break; |
| + case 2: |
| + flags |= gfx::Canvas::TEXT_ALIGN_MIDDLE; |
| + break; |
| + case 3: |
| + flags |= gfx::Canvas::TEXT_ALIGN_BOTTOM; |
| + break; |
| + } |
| } else if (combobox == text_cb_) { |
| switch (combobox->selected_index()) { |
| case 0: |