summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorglen@google.com <glen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-20 18:12:43 +0000
committerglen@google.com <glen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-20 18:12:43 +0000
commit13a5ac6e21ef46f75c791e791a2fa6d392a574bd (patch)
tree8cf90a272399bf739d1e376079bcc842d4251d3c /chrome/browser
parent32f457b1b8b42fd65759755405d49b9c3e8a9ec3 (diff)
downloadchromium_src-13a5ac6e21ef46f75c791e791a2fa6d392a574bd.zip
chromium_src-13a5ac6e21ef46f75c791e791a2fa6d392a574bd.tar.gz
chromium_src-13a5ac6e21ef46f75c791e791a2fa6d392a574bd.tar.bz2
Workaround for truncation of "Search from right here" text when using Hebrew Chrome on Vista. Will file separate bug so the root cause is fixed.
BUG=1325257 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/views/first_run_bubble.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc
index b880abf..2f659de 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -140,11 +140,17 @@ class FirstRunBubbleView : public ChromeViews::View,
GetPreferredSize(&canvas);
CSize pref_size;
+ // The multiline business that follows is dirty hacks to get around
+ // bug 1325257.
+ label1_->SetMultiLine(false);
label1_->GetPreferredSize(&pref_size);
- label1_->SetBounds(kBubblePadding, kBubblePadding, pref_size.cx,
+ label1_->SetMultiLine(true);
+ label1_->SizeToFit(canvas.cx - kBubblePadding * 2);
+ label1_->SetBounds(kBubblePadding, kBubblePadding,
+ canvas.cx - kBubblePadding * 2,
pref_size.cy);
- int next_v_space = label1_->GetY() + label1_->GetHeight() +
+ int next_v_space = label1_->GetY() + pref_size.cy +
kRelatedControlSmallVerticalSpacing;
label2_->GetPreferredSize(&pref_size);