summaryrefslogtreecommitdiffstats
path: root/views/controls/label.cc
diff options
context:
space:
mode:
Diffstat (limited to 'views/controls/label.cc')
-rw-r--r--views/controls/label.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/views/controls/label.cc b/views/controls/label.cc
index 6e9a360..6da6c48 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -100,6 +100,14 @@ gfx::Size Label::GetPreferredSize() {
int Label::ComputeMultiLineFlags() {
int flags = gfx::Canvas::MULTI_LINE;
+ #if !defined(OS_WIN)
+ // Don't ellide multiline labels on Linux.
+ // Todo(davemoore): Do we depend on elliding multiline text?
+ // Pango insists on limiting the number of lines to one if text is
+ // ellided. You can get around this if you can pass a maximum height
+ // but we don't currently have that data when we call the pango code.
+ flags |= gfx::Canvas::NO_ELLIPSIS;
+ #endif
if (allow_character_break_)
flags |= gfx::Canvas::CHARACTER_BREAK;
switch (horiz_alignment_) {