ui/views/controls/button/menu_button.cc - Issue 59383003: Add the button style for combobox

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/button/menu_button.cc

Issue 59383003: Add the button style for combobox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/views/controls/button/menu_button.cc

diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc

index 3d76da7150fd43be6a614bbe46e033d0d2e52742..cf1f596091fb275657d99a52e5b1814cb58c1315 100644

--- a/ui/views/controls/button/menu_button.cc

+++ b/ui/views/controls/button/menu_button.cc

@@ -149,9 +149,10 @@ void MenuButton::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {

gfx::Size MenuButton::GetPreferredSize() {

gfx::Size prefsize = TextButton::GetPreferredSize();

if (show_menu_marker_) {

- prefsize.Enlarge(menu_marker_->width() + kMenuMarkerPaddingLeft +

- kMenuMarkerPaddingRight,

- 0);

+ int width = menu_marker_->width() + kMenuMarkerPaddingRight;

+ if (!text().empty())

+ width += kMenuMarkerPaddingLeft;

+ prefsize.Enlarge(width, 0);

}

return prefsize;

}