diff options
| author | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 15:05:54 +0000 |
|---|---|---|
| committer | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 15:05:54 +0000 |
| commit | 5f6144320143716afd2b5e0291aa3e0bb784faa8 (patch) | |
| tree | a1476d0e8679684b193bc29c13a6b3e62b9cbf64 | |
| parent | c866beca3a5d58dbf4cbfc46a335084e7bd304a1 (diff) | |
| download | chromium_src-5f6144320143716afd2b5e0291aa3e0bb784faa8.zip chromium_src-5f6144320143716afd2b5e0291aa3e0bb784faa8.tar.gz chromium_src-5f6144320143716afd2b5e0291aa3e0bb784faa8.tar.bz2 | |
Make welcome message multiline if needed.
BUG=crosbug.com/2279
TEST=See bug description.
Review URL: http://codereview.chromium.org/2815015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50353 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/network_selection_view.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/network_selection_view.cc b/chrome/browser/chromeos/login/network_selection_view.cc index 039b6b9..6c219861 100644 --- a/chrome/browser/chromeos/login/network_selection_view.cc +++ b/chrome/browser/chromeos/login/network_selection_view.cc @@ -36,7 +36,7 @@ using views::WidgetGtk; namespace { -const int kWelcomeLabelY = 150; +const int kWelcomeLabelY = 170; const int kContinueButtonSpacingX = 30; const int kSpacing = 25; const int kHorizontalSpacing = 25; @@ -95,6 +95,7 @@ void NetworkSelectionView::Init() { welcome_label_ = new views::Label(); welcome_label_->SetColor(kWelcomeColor); welcome_label_->SetFont(welcome_label_font); + welcome_label_->SetMultiLine(true); select_language_label_ = new views::Label(); select_language_label_->SetFont(rb.GetFont(ResourceBundle::MediumFont)); @@ -172,7 +173,12 @@ gfx::Size NetworkSelectionView::GetPreferredSize() { } void NetworkSelectionView::Layout() { + gfx::Insets insets = GetInsets(); + int max_width = this->width() - insets.width() - 2 * kHorizontalSpacing; + welcome_label_->SizeToFit(max_width); int y = kWelcomeLabelY; + y -= welcome_label_->GetPreferredSize().height() / 2; + welcome_label_->SetBounds( (width() - welcome_label_->GetPreferredSize().width()) / 2, y, |