| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-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 "app/resource_bundle.h" | 5 #include "app/resource_bundle.h" |
| 6 | 6 |
| 7 #include "app/gfx/font.h" | 7 #include "app/gfx/font.h" |
| 8 #include "base/gfx/png_decoder.h" | 8 #include "base/gfx/png_decoder.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/string_piece.h" | 10 #include "base/string_piece.h" |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) | 163 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) |
| 164 // Toolkit views needs a less gigantor base font to more correctly match | 164 // Toolkit views needs a less gigantor base font to more correctly match |
| 165 // metrics for the bitmap-based UI. | 165 // metrics for the bitmap-based UI. |
| 166 *base_font_ = base_font_->DeriveFont(-1); | 166 *base_font_ = base_font_->DeriveFont(-1); |
| 167 #endif | 167 #endif |
| 168 | 168 |
| 169 small_font_.reset(new gfx::Font()); | 169 small_font_.reset(new gfx::Font()); |
| 170 *small_font_ = base_font_->DeriveFont(-2); | 170 *small_font_ = base_font_->DeriveFont(-2); |
| 171 | 171 |
| 172 medium_font_.reset(new gfx::Font()); | 172 medium_font_.reset(new gfx::Font()); |
| 173 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) |
| 174 *medium_font_ = base_font_->DeriveFont(2); |
| 175 #else |
| 173 *medium_font_ = base_font_->DeriveFont(3); | 176 *medium_font_ = base_font_->DeriveFont(3); |
| 177 #endif |
| 174 | 178 |
| 175 medium_bold_font_.reset(new gfx::Font()); | 179 medium_bold_font_.reset(new gfx::Font()); |
| 176 *medium_bold_font_ = | 180 *medium_bold_font_ = |
| 177 base_font_->DeriveFont(3, base_font_->style() | gfx::Font::BOLD); | 181 base_font_->DeriveFont(3, base_font_->style() | gfx::Font::BOLD); |
| 178 | 182 |
| 179 large_font_.reset(new gfx::Font()); | 183 large_font_.reset(new gfx::Font()); |
| 180 *large_font_ = base_font_->DeriveFont(8); | 184 *large_font_ = base_font_->DeriveFont(8); |
| 181 } | 185 } |
| 182 } | 186 } |
| 183 | 187 |
| 184 gfx::Font ResourceBundle::GetFont(FontStyle style) { | 188 gfx::Font ResourceBundle::GetFont(FontStyle style) { |
| 185 LoadFontsIfNecessary(); | 189 LoadFontsIfNecessary(); |
| 186 switch(style) { | 190 switch(style) { |
| 187 case SmallFont: | 191 case SmallFont: |
| 188 return *small_font_; | 192 return *small_font_; |
| 189 case MediumFont: | 193 case MediumFont: |
| 190 return *medium_font_; | 194 return *medium_font_; |
| 191 case MediumBoldFont: | 195 case MediumBoldFont: |
| 192 return *medium_bold_font_; | 196 return *medium_bold_font_; |
| 193 case LargeFont: | 197 case LargeFont: |
| 194 return *large_font_; | 198 return *large_font_; |
| 195 default: | 199 default: |
| 196 return *base_font_; | 200 return *base_font_; |
| 197 } | 201 } |
| 198 } | 202 } |
| OLD | NEW |