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..90305f4a9635c77cefe8acd7de3a50c59d2f215b 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,37 @@ 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);

[sky, 2013/09/12 18:44:15]

Why do you need to toggle multiline here?

[ckocagil, 2013/09/12 20:02:08]

The preferred size of this view is the single-line size. So we turn off
multiline, get the single-line size, then turn it back on.

[sky, 2013/09/12 21:23:39]

Add a comment to that effect.

[ckocagil, 2013/09/12 22:05:22]

Done.

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

[sky, 2013/09/12 18:44:15]

Why do you need the display rect here? If you need a rect shouldn't it have an
infinite height and width as you have on 47?

[ckocagil, 2013/09/12 20:02:08]

In multiline mode, RenderText wraps the lines after |display_rect().width()|
pixels. Roughly, this function changes |display_rect().width()| to |w|, so that
we can get the multiline text height with |GetStringSize()|.

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

[sky, 2013/09/12 18:44:15]

Where does 1,21 come from?

[ckocagil, 2013/09/12 20:02:08]

Nowhere in particular, it is just a useful value for testing. |test_range| is
used to color and style some part of the text to see whether colored/styled
texts are rendered correctly.

(Also changed ui::Range to gfx::Range, I forgot this one here while rebasing.)

[sky, 2013/09/12 21:23:39]

Again with the comment.

[ckocagil, 2013/09/12 22:05:22]

Done.

+    test_range.set_start(std::min(test_range.start(), new_contents.length()));
+    test_range.set_end(std::min(test_range.end(), new_contents.length()));
+
     render_text_->SetText(new_contents);
-    SchedulePaint();
+    render_text_->SetColor(SK_ColorBLACK);
+    render_text_->ApplyColor(0xFFFF0000, test_range);
+    render_text_->SetStyle(gfx::DIAGONAL_STRIKE, false);
+    render_text_->ApplyStyle(gfx::DIAGONAL_STRIKE, true, test_range);
+    render_text_->SetStyle(gfx::UNDERLINE, false);
+    render_text_->ApplyStyle(gfx::UNDERLINE, true, test_range);
+    InvalidateLayout();
   }
 
  private:
@@ -53,8 +78,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 +92,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;

[sky, 2013/09/12 18:44:15]

Isn't this the same as ExampleBase::container_? If you need that, expose it.

[ckocagil, 2013/09/12 20:02:08]

Done.

 
-  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(ASCIIToUTF16("views::Label:"));
+  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,7 +115,7 @@ 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::FILL, GridLayout::FILL,
       1.0f, GridLayout::FIXED, 0, 0);
@@ -94,7 +125,7 @@ void MultilineExample::CreateExampleView(View* container) {
   layout->AddView(render_text_view_);
 
   layout->StartRow(0, 0);
-  layout->AddView(new Label(ASCIIToUTF16("views::Label:")));
+  layout->AddView(label_checkbox_);
   layout->AddView(label_);
 
   layout->StartRow(0, 0);
@@ -105,7 +136,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 +147,12 @@ bool MultilineExample::HandleKeyEvent(Textfield* sender,
   return false;
 }
 
+void MultilineExample::ButtonPressed(Button* sender, const ui::Event& event) {
+  DCHECK_EQ(sender, label_checkbox_);
+  label_->SetText(label_checkbox_->checked() ? textfield_->text() : string16());
+  example_container_->Layout();
+  example_container_->SchedulePaint();
+}
+
 }  // namespace examples
 }  // namespace views