| 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..4774f78cc3e89f3881a6e1e58f4a9c94ea78325c 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));
|
| }
|
|
|
| @@ -34,9 +35,25 @@ class MultilineExample::RenderTextView : public View {
|
| render_text_->font_list().GetHeight() + GetInsets().height());
|
| }
|
|
|
| + virtual int GetHeightForWidth(int w) OVERRIDE {
|
| + if (w == 0) // TODO(ckocagil): Why does this happen?
|
| + 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) {
|
| render_text_->SetText(new_contents);
|
| - SchedulePaint();
|
| + ui::Range test_range(1, 21);
|
| + 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();
|
| }
|
|
|
| private:
|
| @@ -53,8 +70,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 +84,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 +107,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,
|
| 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 +133,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 +144,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())
|
| + label_->SetText(textfield_->text());
|
| + else
|
| + label_->SetText(string16());
|
| + example_container_->Layout();
|
| + example_container_->SchedulePaint();
|
| +}
|
| +
|
| } // namespace examples
|
| } // namespace views
|
|
|