Windows implementation of multiline RenderText

ui/views/examples/multiline_example.cc

 // Copyright 2013 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/multiline_example.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/events/event.h"
 #include "ui/gfx/render_text.h"
+#include "ui/views/controls/button/checkbox.h"

[msw, 2013/08/15 02:44:17]

nit: remove this (included by header)

[ckocagil, 2013/08/20 21:25:07]

Done.

 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/layout/fill_layout.h"

[msw, 2013/08/15 02:44:17]

nit: remove this (unused)

[ckocagil, 2013/08/20 21:25:07]

Done.

 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 
 namespace views {
 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) {
+    render_text_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
     render_text_->SetColor(SK_ColorBLACK);
+    render_text_->SetMultiline(true);
+    render_text_->set_clip_to_display_rect(false);

[msw, 2013/08/15 02:44:17]

Hmm, this is no longer used and it's underlying code/settings should be removed
altogether, the PDF bug was resolved in another manner. Let's remove it in a
separate CL. Feel free to remove this call, or leave it as-is if it's otherwise
causing trouble.

[ckocagil, 2013/08/20 21:25:07]

Done, removed.

     set_border(Border::CreateSolidBorder(2, SK_ColorGRAY));
   }
 
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
     View::OnPaint(canvas);
     render_text_->Draw(canvas);
   }
 
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     return gfx::Size(0,
         render_text_->font_list().GetHeight() + GetInsets().height());
   }
 
+  virtual int GetHeightForWidth(int w) OVERRIDE {
+    if (w == 0) // TODO(ckocagil): Why does this happen?

[msw, 2013/08/15 02:44:17]

nit: resolve this (you can just remove the TODO if you want)

[ckocagil, 2013/08/20 21:25:07]

Leaving the TODO here as we decided on IM.

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

[msw, 2013/08/15 02:44:17]

nit: move declaration below the SetText call.

[ckocagil, 2013/08/20 21:25:07]

Done.

     render_text_->SetText(new_contents);
+    render_text_->MoveCursorTo(gfx::SelectionModel(test_range,
+                                                   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();
     SchedulePaint();
   }
 
  private:
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE {
     gfx::Rect bounds = GetLocalBounds();
     bounds.Inset(GetInsets());
     render_text_->SetDisplayRect(bounds);
   }
 
   scoped_ptr<gfx::RenderText> render_text_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderTextView);
 };
 
 MultilineExample::MultilineExample()
     : ExampleBase("Multiline RenderText"),
+      top_container_(NULL),
       render_text_view_(NULL),
       label_(NULL),
+      label_checkbox_(NULL),
       textfield_(NULL) {
 }
 
 MultilineExample::~MultilineExample() {
 }
 
 void MultilineExample::CreateExampleView(View* container) {
   const char kTestString[] = "test string asdf 1234 test string asdf 1234 "
                              "test string asdf 1234 test string asdf 1234";
 
+  top_container_ = container;

[msw, 2013/08/15 02:44:17]

nit: |example_container_| seems clearer.

[ckocagil, 2013/08/20 21:25:07]

Done.

+
   gfx::RenderText* render_text = gfx::RenderText::CreateInstance();

[msw, 2013/08/15 02:44:17]

Move this to the RenderTextView ctor initialization list.

[ckocagil, 2013/08/20 21:25:07]

Done.

-  render_text->SetText(ASCIIToUTF16(kTestString));
-  render_text->SetHorizontalAlignment(gfx::ALIGN_CENTER);
 
   render_text_view_ = new RenderTextView(render_text);
+  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));
 
   GridLayout* layout = new GridLayout(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,
       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_);
 }
 
 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);
+  top_container_->Layout();

[msw, 2013/08/15 02:44:17]

Can you just InvalidateLayout instead of Layout+SchedulePaint? ditto below.

[ckocagil, 2013/08/20 21:25:07]

It seems to need to be both laid out and painted. AFAIK neither of these imply
the other, so I can't get rid of them.

+  top_container_->SchedulePaint();
 }
 
 bool MultilineExample::HandleKeyEvent(Textfield* sender,
                                       const ui::KeyEvent& key_event) {
   return false;
 }
 
+void MultilineExample::ButtonPressed(Button* sender, const ui::Event& event) {
+  if (sender != label_checkbox_)

[msw, 2013/08/15 02:44:17]

nit: just DCHECK this

[ckocagil, 2013/08/20 21:25:07]

Done.

+    return;
+  if (label_checkbox_->checked())
+    label_->SetText(textfield_->text());
+  else
+    label_->SetText(string16());
+  top_container_->Layout();
+  top_container_->SchedulePaint();
+}
+
 }  // namespace examples
 }  // namespace views