OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "views/controls/menu/menu_config.h" | 5 #include "views/controls/menu/menu_config.h" |
6 | 6 |
7 #include <windows.h> | 7 #include <windows.h> |
8 #include <uxtheme.h> | 8 #include <uxtheme.h> |
9 #include <Vssym32.h> | 9 #include <Vssym32.h> |
10 | 10 |
(...skipping 11 matching lines...) Expand all Loading... | |
22 MenuConfig* MenuConfig::Create() { | 22 MenuConfig* MenuConfig::Create() { |
23 MenuConfig* config = new MenuConfig(); | 23 MenuConfig* config = new MenuConfig(); |
24 | 24 |
25 config->text_color = NativeThemeWin::instance()->GetThemeColorWithDefault( | 25 config->text_color = NativeThemeWin::instance()->GetThemeColorWithDefault( |
26 NativeThemeWin::MENU, MENU_POPUPITEM, MPI_NORMAL, TMT_TEXTCOLOR, | 26 NativeThemeWin::MENU, MENU_POPUPITEM, MPI_NORMAL, TMT_TEXTCOLOR, |
27 COLOR_MENUTEXT); | 27 COLOR_MENUTEXT); |
28 | 28 |
29 NONCLIENTMETRICS metrics; | 29 NONCLIENTMETRICS metrics; |
30 base::win::GetNonClientMetrics(&metrics); | 30 base::win::GetNonClientMetrics(&metrics); |
31 l10n_util::AdjustUIFont(&(metrics.lfMenuFont)); | 31 l10n_util::AdjustUIFont(&(metrics.lfMenuFont)); |
32 HFONT font = CreateFontIndirect(&metrics.lfMenuFont); | 32 HFONT font = CreateFontIndirect(&metrics.lfMenuFont); |
sky
2011/09/21 22:31:57
Actually, could you change this to use base::win::
| |
33 DLOG_ASSERT(font); | 33 DLOG_ASSERT(font); |
34 config->font = gfx::Font(font); | 34 config->font = gfx::Font(font); |
35 DeleteObject(font); | |
35 | 36 |
36 NativeTheme::ExtraParams extra; | 37 NativeTheme::ExtraParams extra; |
37 extra.menu_check.is_radio = false; | 38 extra.menu_check.is_radio = false; |
38 extra.menu_check.is_selected = false; | 39 extra.menu_check.is_selected = false; |
39 gfx::Size check_size = NativeTheme::instance()->GetPartSize( | 40 gfx::Size check_size = NativeTheme::instance()->GetPartSize( |
40 NativeTheme::kMenuCheck, NativeTheme::kNormal, extra); | 41 NativeTheme::kMenuCheck, NativeTheme::kNormal, extra); |
41 if (!check_size.IsEmpty()) { | 42 if (!check_size.IsEmpty()) { |
42 config->check_width = check_size.width(); | 43 config->check_width = check_size.width(); |
43 config->check_height = check_size.height(); | 44 config->check_height = check_size.height(); |
44 } else { | 45 } else { |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
93 config->item_no_icon_top_margin = config->item_top_margin; | 94 config->item_no_icon_top_margin = config->item_top_margin; |
94 | 95 |
95 BOOL show_cues; | 96 BOOL show_cues; |
96 config->show_mnemonics = | 97 config->show_mnemonics = |
97 (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &show_cues, 0) && | 98 (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &show_cues, 0) && |
98 show_cues == TRUE); | 99 show_cues == TRUE); |
99 return config; | 100 return config; |
100 } | 101 } |
101 | 102 |
102 } // namespace views | 103 } // namespace views |
OLD | NEW |