From 96ee5c07dbe235b45e4d178a43887fddcf251861 Mon Sep 17 00:00:00 2001 From: "sidchat@google.com" Date: Fri, 5 Dec 2008 18:32:27 +0000 Subject: Fix the layout of the Spell Check Options part, in the languages tab, in the Fonts and Languages Options Menu, to match with the Mock. Issue=4401 Review URL: http://codereview.chromium.org/12957 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6437 0039d316-1c4b-4281-b951-d872f2087c98 --- .../browser/views/options/languages_page_view.cc | 38 ++++++++++++---------- 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'chrome/browser/views') diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index e9a1e8b..5972e38 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -613,18 +613,6 @@ void LanguagesPageView::InitControlLayout() { l10n_util::GetString(IDS_OPTIONS_ENABLE_SPELLCHECK)); enable_spellchecking_checkbox_->SetListener(this); enable_spellchecking_checkbox_->SetMultiLine(true); - - layout->StartRow(0, single_column_view_set_id); - layout->AddView(language_info_label_); - layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); - - const int double_column_view_set_2_id = 2; - column_set = layout->AddColumnSet(double_column_view_set_2_id); - column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0, - GridLayout::USE_PREF, 0, 0); - column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); - column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, - GridLayout::USE_PREF, 0, 0); // Determine Locale Codes. std::vector locale_codes; @@ -641,19 +629,33 @@ void LanguagesPageView::InitControlLayout() { new views::ComboBox(dictionary_language_model_.get()); change_dictionary_language_combobox_->SetListener(this); - layout->StartRow(0, double_column_view_set_2_id); - layout->AddView(ui_language_label_); - layout->AddView(change_ui_language_combobox_); - layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); - - // SpellChecker settings. + // SpellCheck language settings. layout->StartRow(0, single_column_view_set_id); layout->AddView(enable_spellchecking_checkbox_); layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); + const int double_column_view_set_2_id = 2; + column_set = layout->AddColumnSet(double_column_view_set_2_id); + column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0, + GridLayout::USE_PREF, 0, 0); + column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); + column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, + GridLayout::USE_PREF, 0, 0); + layout->StartRow(0, double_column_view_set_2_id); layout->AddView(dictionary_language_label_); layout->AddView(change_dictionary_language_combobox_); + // UI language settings. + layout->AddPaddingRow(0, kUnrelatedControlLargeVerticalSpacing); + layout->StartRow(0, single_column_view_set_id); + layout->AddView(language_info_label_); + layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); + + layout->StartRow(0, double_column_view_set_2_id); + layout->AddView(ui_language_label_); + layout->AddView(change_ui_language_combobox_); + layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); + // Init member prefs so we can update the controls if prefs change. app_locale_.Init(prefs::kApplicationLocale, g_browser_process->local_state(), this); -- cgit v1.1