From 53abf9a912d4cbb36066b682b493d678fbffec87 Mon Sep 17 00:00:00 2001 From: "akuegel@chromium.org" Date: Tue, 2 Jul 2013 08:03:42 +0000 Subject: Merge 209322 "Fix bug with the avatar menu alignment." > Fix bug with the avatar menu alignment. > > BUG=254364 > TEST=In avatar menu of managed user, click on switch user. > > Review URL: https://chromiumcodereview.appspot.com/18199004 TBR=akuegel@chromium.org Review URL: https://codereview.chromium.org/18488002 git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@209646 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm index 4514695..26e5ec9 100644 --- a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm @@ -183,11 +183,13 @@ const CGFloat kManagedUserSpacing = 26.0; NSRect frame = [[self window] frame]; // Adjust the origin after we have switched from the managed user menu to the // regular menu. - if (expanded_) + CGFloat newWidth = std::min(kBubbleMinWidth + width, kBubbleMaxWidth); + if (expanded_) { + frame.origin.x += frame.size.width - newWidth; frame.origin.y += frame.size.height - yOffset; + } frame.size.height = yOffset; - frame.size.width = kBubbleMinWidth + width; - frame.size.width = std::min(NSWidth(frame), kBubbleMaxWidth); + frame.size.width = newWidth; [[self window] setFrame:frame display:YES]; } -- cgit v1.1