chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm - Issue 2208973003: Add some extra height to bookmark bar if the font wants to be larger

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: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

Issue 2208973003: Add some extra height to bookmark bar if the font wants to be larger (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address various nits from code review comments Created 4 years, 3 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 | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

index 62a2787eca9a69393915a14ec24ae898cb5c1e7e..a85d5134f4e2765f5bf5f2b7f0794c4dad13fa5f 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

@@ -1096,7 +1096,7 @@ CGFloat BookmarkRightMargin() {

[view setHidden:NO];

// Height takes into account the extra height we have since the toolbar

// only compresses when we're done.

- [view animateToNewHeight:(chrome::kBookmarkBarHeight -

+ [view animateToNewHeight:(chrome::kMinimumBookmarkBarHeight -

bookmarks::kBookmarkBarOverlap)

duration:kBookmarkBarAnimationDuration];

} else if ([self isAnimatingFromState:BookmarkBar::SHOW

@@ -1117,7 +1117,7 @@ CGFloat BookmarkRightMargin() {

[view setHidden:NO];

// Height takes into account the extra height we have since the toolbar

// only compresses when we're done.

- [view animateToNewHeight:(chrome::kBookmarkBarHeight -

+ [view animateToNewHeight:(chrome::kMinimumBookmarkBarHeight -

bookmarks::kBookmarkBarOverlap)

duration:kBookmarkBarAnimationDuration];

} else {

@@ -1166,8 +1166,8 @@ CGFloat BookmarkRightMargin() {

reduceHeight =

isRetina && !ui::MaterialDesignController::IsModeMaterial();

- return reduceHeight ? chrome::kBookmarkBarHeight + 1

- : chrome::kBookmarkBarHeight;

+ return reduceHeight ? chrome::kMinimumBookmarkBarHeight + 1

+ : chrome::kMinimumBookmarkBarHeight;

case BookmarkBar::DETACHED:

return chrome::kNTPBookmarkBarHeight;

case BookmarkBar::HIDDEN: