|
Tweaks for the merged menu:
. makes the menu show the same fonts regardless of whether the item
has children.
. adds text color to MenuConfig. I'm going to use this for the buttons
added to the menu.
. Changes TextButton to update text_size_ when the font changes.
. Changes TextButton to allow you to specify how accelerators are
shown.
. Nukes TextButton::OnMousePressed as it's not needed (super
implementation does the right thing and updates state the
TextButton::OnMousePressed wasn't).
. Changes accelerator to have constructor taking keycode and modifiers.
BUG= 45734
TEST=none
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=50108
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+85 lines, -31 lines) |
Patch |
 |
M |
app/menus/accelerator.h
|
View
|
|
3 chunks |
+10 lines, -4 lines |
0 comments
|
Download
|
 |
M |
views/accelerator.h
|
View
|
|
2 chunks |
+4 lines, -1 line |
0 comments
|
Download
|
 |
M |
views/controls/button/text_button.h
|
View
|
|
6 chunks |
+22 lines, -2 lines |
0 comments
|
Download
|
 |
M |
views/controls/button/text_button.cc
|
View
|
|
10 chunks |
+37 lines, -15 lines |
0 comments
|
Download
|
 |
M |
views/controls/menu/menu_config.h
|
View
|
|
3 chunks |
+5 lines, -3 lines |
0 comments
|
Download
|
 |
M |
views/controls/menu/menu_config_gtk.cc
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
M |
views/controls/menu/menu_config_win.cc
|
View
|
|
1 chunk |
+5 lines, -1 line |
0 comments
|
Download
|
 |
M |
views/controls/menu/menu_item_view_gtk.cc
|
View
|
|
1 chunk |
+1 line, -2 lines |
0 comments
|
Download
|
 |
M |
views/controls/menu/menu_item_view_win.cc
|
View
|
|
1 chunk |
+1 line, -2 lines |
0 comments
|
Download
|
Total messages: 2 (0 generated)
|