OLD | NEW |
---|---|
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/ui/views/harmony/chrome_typography.h" | 5 #include "chrome/browser/ui/views/harmony/chrome_typography.h" |
6 | 6 |
7 #include "ui/base/default_style.h" | 7 #include "ui/base/default_style.h" |
8 #include "ui/base/resource/resource_bundle.h" | 8 #include "ui/base/resource/resource_bundle.h" |
9 #include "ui/gfx/platform_font.h" | |
10 | |
11 void ApplyCommonFontStyles(int context, | |
12 int style, | |
13 int* size_delta, | |
14 gfx::Font::Weight* weight) { | |
15 if (context == CONTEXT_WINDOWS10_NATIVE) { | |
grt (UTC plus 2)
2017/08/17 11:26:32
do non-win platforms need this code? should there
skare_
2017/08/18 11:37:33
I don't think they need this. ifdef'ed out
| |
16 *size_delta = 15 - gfx::PlatformFont::kDefaultBaseFontSize; | |
grt (UTC plus 2)
2017/08/17 11:26:32
could you drop a comment explaining 15?
skare_
2017/08/18 11:37:33
Done.
| |
17 *weight = views::TypographyProvider::MediumWeightForUI(); | |
18 } | |
19 } | |
9 | 20 |
10 const gfx::FontList& LegacyTypographyProvider::GetFont(int context, | 21 const gfx::FontList& LegacyTypographyProvider::GetFont(int context, |
11 int style) const { | 22 int style) const { |
12 constexpr int kHeadlineDelta = 8; | 23 constexpr int kHeadlineDelta = 8; |
13 constexpr int kDialogMessageDelta = 1; | 24 constexpr int kDialogMessageDelta = 1; |
14 | 25 |
15 int size_delta; | 26 int size_delta; |
16 gfx::Font::Weight font_weight; | 27 gfx::Font::Weight font_weight; |
17 GetDefaultFont(context, style, &size_delta, &font_weight); | 28 GetDefaultFont(context, style, &size_delta, &font_weight); |
18 | 29 |
19 #if defined(USE_ASH) | 30 #if defined(USE_ASH) |
20 ash::ApplyAshFontStyles(context, style, &size_delta, &font_weight); | 31 ash::ApplyAshFontStyles(context, style, &size_delta, &font_weight); |
21 #endif | 32 #endif |
22 | 33 |
34 ApplyCommonFontStyles(context, style, &size_delta, &font_weight); | |
35 | |
23 switch (context) { | 36 switch (context) { |
24 case CONTEXT_HEADLINE: | 37 case CONTEXT_HEADLINE: |
25 size_delta = kHeadlineDelta; | 38 size_delta = kHeadlineDelta; |
26 break; | 39 break; |
27 case CONTEXT_BODY_TEXT_LARGE: | 40 case CONTEXT_BODY_TEXT_LARGE: |
28 // Note: Not using ui::kMessageFontSizeDelta, so 13pt in most cases. | 41 // Note: Not using ui::kMessageFontSizeDelta, so 13pt in most cases. |
29 size_delta = kDialogMessageDelta; | 42 size_delta = kDialogMessageDelta; |
30 break; | 43 break; |
31 case CONTEXT_BODY_TEXT_SMALL: | 44 case CONTEXT_BODY_TEXT_SMALL: |
32 size_delta = ui::kLabelFontSizeDelta; | 45 size_delta = ui::kLabelFontSizeDelta; |
(...skipping 15 matching lines...) Expand all Loading... | |
48 | 61 |
49 SkColor LegacyTypographyProvider::GetColor(int context, | 62 SkColor LegacyTypographyProvider::GetColor(int context, |
50 int style, | 63 int style, |
51 const ui::NativeTheme& theme) const { | 64 const ui::NativeTheme& theme) const { |
52 // Use "disabled grey" for HINT and SECONDARY when Harmony is disabled. | 65 // Use "disabled grey" for HINT and SECONDARY when Harmony is disabled. |
53 if (style == STYLE_HINT || style == STYLE_SECONDARY) | 66 if (style == STYLE_HINT || style == STYLE_SECONDARY) |
54 style = views::style::STYLE_DISABLED; | 67 style = views::style::STYLE_DISABLED; |
55 | 68 |
56 return DefaultTypographyProvider::GetColor(context, style, theme); | 69 return DefaultTypographyProvider::GetColor(context, style, theme); |
57 } | 70 } |
OLD | NEW |