Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Side by Side Diff: views/controls/menu/menu_config_win.cc

Issue 2741004: Makes it so child views of menuitemview can be traversed with the (Closed)
Patch Set: Tweaks Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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
11 #include "app/l10n_util_win.h" 11 #include "app/l10n_util_win.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/win_util.h" 13 #include "base/win_util.h"
14 #include "gfx/native_theme_win.h" 14 #include "gfx/native_theme_win.h"
15 15
16 using gfx::NativeTheme; 16 using gfx::NativeTheme;
17 17
18 namespace views { 18 namespace views {
19 19
20 // static 20 // static
21 MenuConfig* MenuConfig::Create() { 21 MenuConfig* MenuConfig::Create() {
22 MenuConfig* config = new MenuConfig(); 22 MenuConfig* config = new MenuConfig();
23 NONCLIENTMETRICS metrics; 23 NONCLIENTMETRICS metrics;
24 win_util::GetNonClientMetrics(&metrics); 24 win_util::GetNonClientMetrics(&metrics);
25 l10n_util::AdjustUIFont(&(metrics.lfMenuFont)); 25 l10n_util::AdjustUIFont(&(metrics.lfMenuFont));
26 HFONT font = CreateFontIndirect(&metrics.lfMenuFont); 26 HFONT font = CreateFontIndirect(&metrics.lfMenuFont);
27 DLOG_ASSERT(font); 27 DLOG_ASSERT(font);
28 config->font = gfx::Font::CreateFont(font); 28 config->font = gfx::Font::CreateFont(font);
29 config->font_with_controls = config->font.DeriveFont(0, gfx::Font::BOLD);
29 30
30 HDC dc = GetDC(NULL); 31 HDC dc = GetDC(NULL);
31 RECT bounds = { 0, 0, 200, 200 }; 32 RECT bounds = { 0, 0, 200, 200 };
32 SIZE check_size; 33 SIZE check_size;
33 if (NativeTheme::instance()->GetThemePartSize( 34 if (NativeTheme::instance()->GetThemePartSize(
34 NativeTheme::MENU, dc, MENU_POPUPCHECK, MC_CHECKMARKNORMAL, &bounds, 35 NativeTheme::MENU, dc, MENU_POPUPCHECK, MC_CHECKMARKNORMAL, &bounds,
35 TS_TRUE, &check_size) == S_OK) { 36 TS_TRUE, &check_size) == S_OK) {
36 config->check_width = check_size.cx; 37 config->check_width = check_size.cx;
37 config->check_height = check_size.cy; 38 config->check_height = check_size.cy;
38 } else { 39 } else {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 ReleaseDC(NULL, dc); 76 ReleaseDC(NULL, dc);
76 77
77 BOOL show_cues; 78 BOOL show_cues;
78 config->show_mnemonics = 79 config->show_mnemonics =
79 (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &show_cues, 0) && 80 (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &show_cues, 0) &&
80 show_cues == TRUE); 81 show_cues == TRUE);
81 return config; 82 return config;
82 } 83 }
83 84
84 } // namespace views 85 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698