OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/views/options/fonts_page_view.h" | 5 #include "chrome/browser/views/options/fonts_page_view.h" |
6 | 6 |
7 #include <windows.h> | 7 #include <windows.h> |
8 #include <shlobj.h> | 8 #include <shlobj.h> |
9 #include <vsstyle.h> | 9 #include <vsstyle.h> |
10 #include <vssym32.h> | 10 #include <vssym32.h> |
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 sans_serif_font_size_pixel_); | 286 sans_serif_font_size_pixel_); |
287 } else if (font_type_being_changed_ == SANS_SERIF) { | 287 } else if (font_type_being_changed_ == SANS_SERIF) { |
288 sans_serif_font_size_pixel_ = serif_font_size_pixel_ = font_size; | 288 sans_serif_font_size_pixel_ = serif_font_size_pixel_ = font_size; |
289 sans_serif_font_display_view_->SetFontType( | 289 sans_serif_font_display_view_->SetFontType( |
290 font.FontName(), | 290 font.FontName(), |
291 sans_serif_font_size_pixel_); | 291 sans_serif_font_size_pixel_); |
292 serif_font_display_view_->SetFontType( | 292 serif_font_display_view_->SetFontType( |
293 serif_font_display_view_->font_name(), | 293 serif_font_display_view_->font_name(), |
294 sans_serif_font_size_pixel_); | 294 sans_serif_font_size_pixel_); |
295 } else if (font_type_being_changed_ == FIXED_WIDTH) { | 295 } else if (font_type_being_changed_ == FIXED_WIDTH) { |
| 296 fixed_width_font_size_pixel_ = font_size; |
296 fixed_width_font_display_view_->SetFontType(font.FontName(), font_size); | 297 fixed_width_font_display_view_->SetFontType(font.FontName(), font_size); |
297 } | 298 } |
298 font_changed_ = true; | 299 font_changed_ = true; |
299 } | 300 } |
300 | 301 |
301 void FontsPageView::SaveChanges() { | 302 void FontsPageView::SaveChanges() { |
302 // Set Fonts. | 303 // Set Fonts. |
303 if (font_changed_) { | 304 if (font_changed_) { |
304 serif_name_.SetValue(serif_font_display_view_->font_name()); | 305 serif_name_.SetValue(serif_font_display_view_->font_name()); |
305 serif_size_.SetValue(serif_font_size_pixel_); | 306 serif_size_.SetValue(serif_font_size_pixel_); |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
486 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); | 487 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); |
487 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, | 488 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, |
488 GridLayout::USE_PREF, 0, 0); | 489 GridLayout::USE_PREF, 0, 0); |
489 | 490 |
490 // Add Encoding Combobox. | 491 // Add Encoding Combobox. |
491 layout->StartRow(0, double_column_view_set_id); | 492 layout->StartRow(0, double_column_view_set_id); |
492 layout->AddView(default_encoding_combobox_label_); | 493 layout->AddView(default_encoding_combobox_label_); |
493 layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL, | 494 layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL, |
494 GridLayout::CENTER); | 495 GridLayout::CENTER); |
495 } | 496 } |
OLD | NEW |