Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: ui/views/examples/multiline_example.cc

Issue 16867016: Windows implementation of multiline RenderText (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fit whole runs, remove single-line stuff Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/examples/multiline_example.h" 5 #include "ui/views/examples/multiline_example.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "ui/base/events/event.h" 8 #include "ui/base/events/event.h"
9 #include "ui/gfx/render_text.h" 9 #include "ui/gfx/render_text.h"
10 #include "ui/views/controls/button/checkbox.h"
10 #include "ui/views/controls/label.h" 11 #include "ui/views/controls/label.h"
11 #include "ui/views/controls/textfield/textfield.h" 12 #include "ui/views/controls/textfield/textfield.h"
13 #include "ui/views/layout/fill_layout.h"
12 #include "ui/views/layout/grid_layout.h" 14 #include "ui/views/layout/grid_layout.h"
13 #include "ui/views/view.h" 15 #include "ui/views/view.h"
14 16
15 namespace views { 17 namespace views {
16 namespace examples { 18 namespace examples {
17 19
18 // A simple View that hosts a RenderText object. 20 // A simple View that hosts a RenderText object.
19 class MultilineExample::RenderTextView : public View { 21 class MultilineExample::RenderTextView : public View {
20 public: 22 public:
21 explicit RenderTextView(gfx::RenderText* render_text) 23 explicit RenderTextView(gfx::RenderText* render_text)
22 : render_text_(render_text) { 24 : render_text_(render_text) {
25 render_text->SetHorizontalAlignment(gfx::ALIGN_CENTER);
23 render_text_->SetColor(SK_ColorBLACK); 26 render_text_->SetColor(SK_ColorBLACK);
27 render_text_->set_multiline(true);
24 set_border(Border::CreateSolidBorder(2, SK_ColorGRAY)); 28 set_border(Border::CreateSolidBorder(2, SK_ColorGRAY));
25 } 29 }
26 30
27 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { 31 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
28 View::OnPaint(canvas); 32 View::OnPaint(canvas);
29 render_text_->Draw(canvas); 33 render_text_->Draw(canvas);
30 } 34 }
31 35
32 virtual gfx::Size GetPreferredSize() OVERRIDE { 36 virtual gfx::Size GetPreferredSize() OVERRIDE {
33 return gfx::Size(0, 37 gfx::Size content(render_text_->GetContentWidth(),
34 render_text_->GetFont().GetHeight() + GetInsets().height()); 38 render_text_->GetStringSize().height());
39 content.Enlarge(GetInsets().width(), GetInsets().height());
40 return content;
41 }
42
43 virtual int GetHeightForWidth(int w) OVERRIDE {
44 if (w == 0) // TODO(ckocagil): Why does this happen?
45 return View::GetHeightForWidth(w);
46 gfx::Rect rect = render_text_->display_rect();
47 rect.set_width(w - GetInsets().width());
48 render_text_->SetDisplayRect(rect);
49 return render_text_->GetMultilineTextSize().height() + GetInsets().height();
35 } 50 }
36 51
37 void SetText(const string16& new_contents) { 52 void SetText(const string16& new_contents) {
53 ui::Range test_range(1, 11);
msw 2013/07/17 06:47:18 nit: const. and use this for lines 59 and 60.
ckocagil 2013/07/19 19:40:50 Done.
38 render_text_->SetText(new_contents); 54 render_text_->SetText(new_contents);
55 render_text_->MoveCursorTo(gfx::SelectionModel(test_range,
56 gfx::CURSOR_FORWARD));
57 render_text_->set_selection_background_focused_color(0xFFFF0000);
58 render_text_->set_focused(true);
59 render_text_->ApplyStyle(gfx::DIAGONAL_STRIKE, true, ui::Range(1, 11));
60 render_text_->ApplyStyle(gfx::UNDERLINE, true, ui::Range(1, 11));
61 InvalidateLayout();
39 SchedulePaint(); 62 SchedulePaint();
40 } 63 }
41 64
42 private: 65 private:
43 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE { 66 virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE {
44 gfx::Rect bounds = GetLocalBounds(); 67 gfx::Rect bounds = GetLocalBounds();
45 bounds.Inset(GetInsets()); 68 bounds.Inset(GetInsets());
46 render_text_->SetDisplayRect(bounds); 69 render_text_->SetDisplayRect(bounds);
47 } 70 }
48 71
49 scoped_ptr<gfx::RenderText> render_text_; 72 scoped_ptr<gfx::RenderText> render_text_;
50 73
51 DISALLOW_COPY_AND_ASSIGN(RenderTextView); 74 DISALLOW_COPY_AND_ASSIGN(RenderTextView);
52 }; 75 };
53 76
54 MultilineExample::MultilineExample() 77 MultilineExample::MultilineExample()
55 : ExampleBase("Multiline RenderText"), 78 : ExampleBase("Multiline RenderText"),
79 container_(NULL),
56 render_text_view_(NULL), 80 render_text_view_(NULL),
57 label_(NULL), 81 label_(NULL),
82 label_container_(NULL),
83 label_checkbox_(NULL),
58 textfield_(NULL) { 84 textfield_(NULL) {
59 } 85 }
60 86
61 MultilineExample::~MultilineExample() { 87 MultilineExample::~MultilineExample() {
62 } 88 }
63 89
64 void MultilineExample::CreateExampleView(View* container) { 90 void MultilineExample::CreateExampleView(View* container) {
65 const char kTestString[] = "test string asdf 1234 test string asdf 1234 " 91 const char kTestString[] = "test string asdf 1234 test string asdf 1234 "
66 "test string asdf 1234 test string asdf 1234"; 92 "test string asdf 1234 test string asdf 1234";
67 93
94 container_ = container;
95
68 gfx::RenderText* render_text = gfx::RenderText::CreateInstance(); 96 gfx::RenderText* render_text = gfx::RenderText::CreateInstance();
69 render_text->SetText(ASCIIToUTF16(kTestString));
70 render_text->SetHorizontalAlignment(gfx::ALIGN_CENTER);
71 97
72 render_text_view_ = new RenderTextView(render_text); 98 render_text_view_ = new RenderTextView(render_text);
99 render_text_view_->SetText(ASCIIToUTF16(kTestString));
73 100
74 label_ = new Label(); 101 label_ = new Label();
75 label_->SetText(ASCIIToUTF16(kTestString)); 102 label_->SetText(ASCIIToUTF16(kTestString));
76 label_->SetMultiLine(true); 103 label_->SetMultiLine(true);
77 label_->set_border(Border::CreateSolidBorder(2, SK_ColorCYAN)); 104 label_->set_border(Border::CreateSolidBorder(2, SK_ColorCYAN));
78 105
106 label_container_ = new View;
107 label_container_->SetLayoutManager(new FillLayout);
108 label_container_->AddChildView(label_);
109
110 label_checkbox_ = new Checkbox(string16());
111 label_checkbox_->SetChecked(true);
112 label_checkbox_->set_listener(this);
113 label_checkbox_->set_request_focus_on_press(false);
114
79 textfield_ = new Textfield(); 115 textfield_ = new Textfield();
80 textfield_->SetController(this); 116 textfield_->SetController(this);
81 textfield_->SetText(ASCIIToUTF16(kTestString)); 117 textfield_->SetText(ASCIIToUTF16(kTestString));
82 118
83 GridLayout* layout = new GridLayout(container); 119 GridLayout* layout = new GridLayout(container);
84 container->SetLayoutManager(layout); 120 container->SetLayoutManager(layout);
85 121
86 ColumnSet* column_set = layout->AddColumnSet(0); 122 ColumnSet* column_set = layout->AddColumnSet(0);
87 column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 123 column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER,
124 0.0f, GridLayout::USE_PREF, 0, 0);
125 column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER,
88 0.0f, GridLayout::USE_PREF, 0, 0); 126 0.0f, GridLayout::USE_PREF, 0, 0);
89 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 127 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL,
90 1.0f, GridLayout::FIXED, 0, 0); 128 1.0f, GridLayout::FIXED, 0, 0);
91 129
92 layout->StartRow(0, 0); 130 layout->StartRow(0, 0);
131 layout->AddView(new View);
msw 2013/07/17 06:47:18 I think you can skip a column instead of adding a
ckocagil 2013/07/19 19:40:50 Done.
93 layout->AddView(new Label(ASCIIToUTF16("gfx::RenderText:"))); 132 layout->AddView(new Label(ASCIIToUTF16("gfx::RenderText:")));
94 layout->AddView(render_text_view_); 133 layout->AddView(render_text_view_);
95 134
96 layout->StartRow(0, 0); 135 layout->StartRow(0, 0);
136 layout->AddView(label_checkbox_);
97 layout->AddView(new Label(ASCIIToUTF16("views::Label:"))); 137 layout->AddView(new Label(ASCIIToUTF16("views::Label:")));
98 layout->AddView(label_); 138 layout->AddView(label_container_);
99 139
100 layout->StartRow(0, 0); 140 layout->StartRow(0, 0);
141 layout->AddView(new View);
101 layout->AddView(new Label(ASCIIToUTF16("Sample Text:"))); 142 layout->AddView(new Label(ASCIIToUTF16("Sample Text:")));
102 layout->AddView(textfield_); 143 layout->AddView(textfield_);
103 } 144 }
104 145
105 void MultilineExample::ContentsChanged(Textfield* sender, 146 void MultilineExample::ContentsChanged(Textfield* sender,
106 const string16& new_contents) { 147 const string16& new_contents) {
107 render_text_view_->SetText(new_contents); 148 render_text_view_->SetText(new_contents);
108 label_->SetText(new_contents); 149 label_->SetText(new_contents);
150 container_->Layout();
151 container_->SchedulePaint();
109 } 152 }
110 153
111 bool MultilineExample::HandleKeyEvent(Textfield* sender, 154 bool MultilineExample::HandleKeyEvent(Textfield* sender,
112 const ui::KeyEvent& key_event) { 155 const ui::KeyEvent& key_event) {
113 return false; 156 return false;
114 } 157 }
115 158
159 void MultilineExample::ButtonPressed(Button* sender, const ui::Event& event) {
160 if (sender != label_checkbox_)
161 return;
162 if (label_checkbox_->checked()) {
msw 2013/07/17 06:47:18 Could you set the Label text to empty or the textf
ckocagil 2013/07/19 19:40:50 Done.
163 label_container_->RemoveAllChildViews(true);
164 label_container_->AddChildView(label_);
165 } else {
166 label_container_->RemoveAllChildViews(false);
167 label_container_->AddChildView(new View);
168 }
169 // TODO(ckocagil): we seem to require laying out twice. why?
170 container_->Layout();
171 container_->Layout();
172 container_->SchedulePaint();
173 }
174
116 } // namespace examples 175 } // namespace examples
117 } // namespace views 176 } // namespace views
OLDNEW
« ui/views/examples/multiline_example.h ('K') | « ui/views/examples/multiline_example.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698