| Index: chrome/views/controls/label.cc
|
| ===================================================================
|
| --- chrome/views/controls/label.cc (revision 14610)
|
| +++ chrome/views/controls/label.cc (working copy)
|
| @@ -45,6 +45,7 @@
|
| color_ = kEnabledColor;
|
| horiz_alignment_ = ALIGN_CENTER;
|
| is_multi_line_ = false;
|
| + allow_character_break_ = false;
|
| collapse_when_hidden_ = false;
|
| rtl_alignment_mode_ = USE_UI_ALIGNMENT;
|
| paint_as_focused_ = false;
|
| @@ -80,6 +81,8 @@
|
|
|
| int Label::ComputeMultiLineFlags() {
|
| int flags = ChromeCanvas::MULTI_LINE;
|
| + if (allow_character_break_)
|
| + flags |= ChromeCanvas::CHARACTER_BREAK;
|
| switch (horiz_alignment_) {
|
| case ALIGN_LEFT:
|
| flags |= ChromeCanvas::TEXT_ALIGN_LEFT;
|
| @@ -282,6 +285,13 @@
|
| }
|
| }
|
|
|
| +void Label::SetAllowCharacterBreak(bool f) {
|
| + if (f != allow_character_break_) {
|
| + allow_character_break_ = f;
|
| + SchedulePaint();
|
| + }
|
| +}
|
| +
|
| bool Label::IsMultiLine() {
|
| return is_multi_line_;
|
| }
|
|
|