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

Unified Diff: ui/views/controls/menu/menu_item_view.cc

Issue 13482012: fix layout of requestAutocomplete suggestion dropdown menu on views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: FIXME into comment Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/menu/menu_item_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_item_view.cc
diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc
index c40c05ad4a032a7fbc74d3292670cc0982f187f3..f974a0fd1ca909cb8e060e53ed963ee1dc1b12a4 100644
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -838,9 +838,7 @@ void MenuItemView::PaintButtonCommon(gfx::Canvas* canvas,
const gfx::Font& font = GetFont();
int accel_width = parent_menu_item_->GetSubmenu()->max_accelerator_width();
- int label_start = label_start_ + left_icon_margin_ + right_icon_margin_;
- if ((type_ == CHECKBOX || type_ == RADIO) && icon_view_)
- label_start += icon_view_->size().width() + config.icon_to_label_padding;
+ int label_start = GetLabelStartForThisItem();
int width = this->width() - label_start - accel_width -
(!delegate ||
@@ -989,7 +987,7 @@ MenuItemView::MenuItemDimensions MenuItemView::CalculateDimensions() {
left_icon_margin_ = 0;
right_icon_margin_ = 0;
}
- int label_start = label_start_ + left_icon_margin_ + right_icon_margin_;
+ int label_start = GetLabelStartForThisItem();
dimensions.standard_width = font.GetStringWidth(title_) + label_start +
item_right_margin_;
@@ -1006,6 +1004,15 @@ MenuItemView::MenuItemDimensions MenuItemView::CalculateDimensions() {
return dimensions;
}
+int MenuItemView::GetLabelStartForThisItem() {
+ int label_start = label_start_ + left_icon_margin_ + right_icon_margin_;
+ if ((type_ == CHECKBOX || type_ == RADIO) && icon_view_) {
+ label_start += icon_view_->size().width() +
+ GetMenuConfig().icon_to_label_padding;
+ }
+ return label_start;
+}
+
string16 MenuItemView::GetAcceleratorText() {
if (id() == kEmptyMenuItemViewID) {
// Don't query the delegate for menus that represent no children.
« no previous file with comments | « ui/views/controls/menu/menu_item_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698