[RenderText] Adding vertical alignment options

ui/views/examples/text_example.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/examples/text_example.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/views/border.h"
@@ skipping 30 matching lines @@
     L"\x5e9\x5dc\x5d5\x5dd \x5d4\x5e2\x5d5\x5dc\x5dd! "
     L"\x5e9\x5dc\x5d5\x5dd \x5d4\x5e2\x5d5\x5dc\x5dd! "
     L"\x5e9\x5dc\x5d5\x5dd \x5d4\x5e2\x5d5\x5dc\x5dd! "
     L"\x5e9\x5dc\x5d5\x5dd \x5d4\x5e2\x5d5\x5dc\x5dd! "
     L"\x5e9\x5dc\x5d5\x5dd \x5d4\x5e2\x5d5\x5dc\x5dd!";
 
 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 one line like those above:
const char* kVerticalAligments[] = { "Default", "Top", "Middle", "Bottom", };

+    "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())
     *flags |= flag;
   else
     *flags &= ~flag;
 }
 
 }  // namespace
@@ skipping 90 matching lines @@
   column_set->AddPaddingColumn(0, 8);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL,
                         0.1f, GridLayout::USE_PREF, 0, 0);
   for (int i = 0; i < kNumColumns - 1; i++)
     column_set->AddColumn(GridLayout::FILL, GridLayout::FILL,
                           0.1f, GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, 8);
 
   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,
                            arraysize(kPrefixOptions));
   text_cb_ = AddCombobox(layout, "Example Text", kTextExamples,
                          arraysize(kTextExamples));
 
   layout->StartRow(0, 0);
   multiline_checkbox_ = AddCheckbox(layout, "Multiline");
   break_checkbox_ = AddCheckbox(layout, "Character Break");
@@ skipping 39 matching lines @@
       case 1:
         flags |= gfx::Canvas::TEXT_ALIGN_LEFT;
         break;
       case 2:
         flags |= gfx::Canvas::TEXT_ALIGN_CENTER;
         break;
       case 3:
         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'd be nice to avoid those and
either (1) extend the multi-line example with RenderText with vertical alignment
options, (2) extend the Label example with vertical alignment options (3) make a
RenderText example on par with this canvas text rendering example... These
changes are entirely optional, adding the flags for this example isn't so bad...
we'll just eventually want to avoid those flags and improve these examples.

+        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:
         text_view_->set_text(base::ASCIIToUTF16(kShortText));
         break;
       case 1:
         text_view_->set_text(base::ASCIIToUTF16(kLongText));
         break;
       case 2:
         text_view_->set_text(base::ASCIIToUTF16(kAmpersandText));
@@ skipping 26 matching lines @@
         flags |= gfx::Canvas::HIDE_PREFIX;
         break;
     }
   }
   text_view_->set_flags(flags);
   text_view_->SchedulePaint();
 }
 
 }  // namespace examples
 }  // namespace views