Windows implementation of multiline RenderText

ui/views/examples/multiline_example.cc

Index: ui/views/examples/multiline_example.cc
diff --git a/ui/views/examples/multiline_example.cc b/ui/views/examples/multiline_example.cc
index 8d13bf510c6231b715f5f302552e6a03f9504dcc..2b4e4c693a3b6f597de5c83da73f4cdf724385f2 100644
--- a/ui/views/examples/multiline_example.cc
+++ b/ui/views/examples/multiline_example.cc
@@ -18,9 +18,10 @@ namespace examples {
 // A simple View that hosts a RenderText object.
 class MultilineExample::RenderTextView : public View {
  public:
-  explicit RenderTextView(gfx::RenderText* render_text)
-      : render_text_(render_text) {
+  RenderTextView() : render_text_(gfx::RenderText::CreateInstance()) {
+    render_text_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
     render_text_->SetColor(SK_ColorBLACK);
+    render_text_->SetMultiline(true);
     set_border(Border::CreateSolidBorder(2, SK_ColorGRAY));
   }
 
@@ -30,13 +31,33 @@ class MultilineExample::RenderTextView : public View {
   }
 
   virtual gfx::Size GetPreferredSize() OVERRIDE {
-    return gfx::Size(0,
-        render_text_->font_list().GetHeight() + GetInsets().height());
+    render_text_->SetMultiline(false);
+    gfx::Size size(render_text_->GetContentWidth(),

[msw, 2013/09/06 23:47:45]

Can you simply init |size| to render_text_->GetStringSize()?

[ckocagil, 2013/09/11 14:59:49]

If I do that, |size| won't reserve space for the cursor.

[msw, 2013/09/11 17:32:37]

Okay

+                   render_text_->GetStringSize().height());
+    size.Enlarge(GetInsets().width(), GetInsets().height());
+    render_text_->SetMultiline(true);
+    return size;
+  }
+
+  virtual int GetHeightForWidth(int w) OVERRIDE {
+    if (w == 0) // TODO(ckocagil): Why does this happen?

[msw, 2013/09/06 23:47:45]

nit: Move the comment up to the previous line.

[ckocagil, 2013/09/11 14:59:49]

Done.

+      return View::GetHeightForWidth(w);
+    gfx::Rect rect = render_text_->display_rect();
+    rect.set_width(w - GetInsets().width());
+    render_text_->SetDisplayRect(rect);
+    return render_text_->GetStringSize().height() + GetInsets().height();
   }
 
   void SetText(const string16& new_contents) {
     render_text_->SetText(new_contents);
-    SchedulePaint();
+    ui::Range test_range(1, 21);

[msw, 2013/09/06 23:47:45]

Ensure new_contents is at least 12 chars. Also nit: const.

[ckocagil, 2013/09/11 14:59:49]

I now ensure that test_range.start() and test_range.end() are not bigger than
new_contents.length().

+    render_text_->MoveCursorTo(gfx::SelectionModel(test_range,

[msw, 2013/09/06 23:47:45]

nit: can you call RenderText::ApplyColor additionally or instead?

[ckocagil, 2013/09/11 14:59:49]

Done, called instead.

+                                                   gfx::CURSOR_FORWARD));
+    render_text_->set_selection_background_focused_color(0xFFFF0000);
+    render_text_->set_focused(true);
+    render_text_->ApplyStyle(gfx::DIAGONAL_STRIKE, true, test_range);
+    render_text_->ApplyStyle(gfx::UNDERLINE, true, test_range);
+    InvalidateLayout();
   }
 
  private:
@@ -53,8 +74,10 @@ class MultilineExample::RenderTextView : public View {
 
 MultilineExample::MultilineExample()
     : ExampleBase("Multiline RenderText"),
+      example_container_(NULL),
       render_text_view_(NULL),
       label_(NULL),
+      label_checkbox_(NULL),
       textfield_(NULL) {
 }
 
@@ -65,17 +88,21 @@ void MultilineExample::CreateExampleView(View* container) {
   const char kTestString[] = "test string asdf 1234 test string asdf 1234 "
                              "test string asdf 1234 test string asdf 1234";
 
-  gfx::RenderText* render_text = gfx::RenderText::CreateInstance();
-  render_text->SetText(ASCIIToUTF16(kTestString));
-  render_text->SetHorizontalAlignment(gfx::ALIGN_CENTER);
+  example_container_ = container;
 
-  render_text_view_ = new RenderTextView(render_text);
+  render_text_view_ = new RenderTextView();
+  render_text_view_->SetText(ASCIIToUTF16(kTestString));
 
   label_ = new Label();
   label_->SetText(ASCIIToUTF16(kTestString));
   label_->SetMultiLine(true);
   label_->set_border(Border::CreateSolidBorder(2, SK_ColorCYAN));
 
+  label_checkbox_ = new Checkbox(string16());
+  label_checkbox_->SetChecked(true);
+  label_checkbox_->set_listener(this);
+  label_checkbox_->set_request_focus_on_press(false);
+
   textfield_ = new Textfield();
   textfield_->SetController(this);
   textfield_->SetText(ASCIIToUTF16(kTestString));
@@ -84,20 +111,25 @@ void MultilineExample::CreateExampleView(View* container) {
   container->SetLayoutManager(layout);
 
   ColumnSet* column_set = layout->AddColumnSet(0);
-  column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL,
+  column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER,
+      0.0f, GridLayout::USE_PREF, 0, 0);
+  column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER,

[msw, 2013/09/06 23:47:45]

Instead of adding a new column to place the empty-labeled Checkbox next to the
"views::Label:" Label, simply set the Checkbox text to "views::Label:".

[ckocagil, 2013/09/11 14:59:49]

Done.

       0.0f, GridLayout::USE_PREF, 0, 0);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL,
       1.0f, GridLayout::FIXED, 0, 0);
 
   layout->StartRow(0, 0);
+  layout->SkipColumns(1);
   layout->AddView(new Label(ASCIIToUTF16("gfx::RenderText:")));
   layout->AddView(render_text_view_);
 
   layout->StartRow(0, 0);
+  layout->AddView(label_checkbox_);
   layout->AddView(new Label(ASCIIToUTF16("views::Label:")));
   layout->AddView(label_);
 
   layout->StartRow(0, 0);
+  layout->SkipColumns(1);
   layout->AddView(new Label(ASCIIToUTF16("Sample Text:")));
   layout->AddView(textfield_);
 }
@@ -105,7 +137,10 @@ void MultilineExample::CreateExampleView(View* container) {
 void MultilineExample::ContentsChanged(Textfield* sender,
                                        const string16& new_contents) {
   render_text_view_->SetText(new_contents);
-  label_->SetText(new_contents);
+  if (label_checkbox_->checked())
+    label_->SetText(new_contents);
+  example_container_->Layout();
+  example_container_->SchedulePaint();
 }
 
 bool MultilineExample::HandleKeyEvent(Textfield* sender,
@@ -113,5 +148,15 @@ bool MultilineExample::HandleKeyEvent(Textfield* sender,
   return false;
 }
 
+void MultilineExample::ButtonPressed(Button* sender, const ui::Event& event) {
+  DCHECK_EQ(sender, label_checkbox_);
+  if (label_checkbox_->checked())

[msw, 2013/09/06 23:47:45]

optional nit:  label_->SetText(label_checkbox_->checked() ? textfield_->text() :
string16());

[ckocagil, 2013/09/11 14:59:49]

Done.

+    label_->SetText(textfield_->text());
+  else
+    label_->SetText(string16());
+  example_container_->Layout();
+  example_container_->SchedulePaint();
+}
+
 }  // namespace examples
 }  // namespace views