Add some extra height to bookmark bar if the font wants to be larger

chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 580 matching lines @@
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ButtonSeparatorView);
 };
 
 // BookmarkBarView ------------------------------------------------------------
 
 // static
 const char BookmarkBarView::kViewClassName[] = "BookmarkBarView";
+int BookmarkBarView::extra_font_padding_ = -1;
 
 BookmarkBarView::BookmarkBarView(Browser* browser, BrowserView* browser_view)
     : page_navigator_(NULL),
       managed_(NULL),
       bookmark_menu_(NULL),
       bookmark_drop_menu_(NULL),
       other_bookmarks_button_(NULL),
       managed_bookmarks_button_(NULL),
       supervised_bookmarks_button_(NULL),
       apps_page_shortcut_(NULL),
@@ skipping 225 matching lines @@
   if (infobar_visible_)
     return detached_overlap;
 
   // When detached with no infobar, animate the overlap between the attached and
   // detached states.
   return detached_overlap + static_cast<int>(
       (attached_overlap - detached_overlap) *
           size_animation_.GetCurrentValue());
 }
 
+int BookmarkBarView::GetExtraFontPadding() const {
+  if (extra_font_padding_ == -1) {
+    int height = 0;
+    for (int i = 0; i < child_count(); ++i) {
+      const views::View* view = child_at(i);
+      gfx::Size pref = view->GetPreferredSize();
+      height = std::max(pref.height(), height);
+    }
+    extra_font_padding_ = std::max(0, height - chrome::kBookmarkBarHeight);
+  }
+  return extra_font_padding_;
+}
+
 gfx::Size BookmarkBarView::GetPreferredSize() const {
   gfx::Size prefsize;
   if (IsDetached()) {
+    int padded_height = chrome::kBookmarkBarHeight + GetExtraFontPadding();
     prefsize.set_height(
-        chrome::kBookmarkBarHeight +
-        static_cast<int>(
-            (chrome::kNTPBookmarkBarHeight - chrome::kBookmarkBarHeight) *
-            (1 - size_animation_.GetCurrentValue())));
+        padded_height +
+        static_cast<int>((chrome::kNTPBookmarkBarHeight - padded_height) *
+                         (1 - size_animation_.GetCurrentValue())));
   } else {
-    prefsize.set_height(static_cast<int>(chrome::kBookmarkBarHeight *
-                                         size_animation_.GetCurrentValue()));
+    prefsize.set_height(
+        static_cast<int>((chrome::kBookmarkBarHeight + GetExtraFontPadding()) *

[Evan Stade, 2016/08/04 16:05:40]

this should probably just take the max of its children's preferred heights and
add some padding. What you have now doesn't actually respond to changes in
children since it only calculates the extra padding the first time.

[kylix_rd, 2016/08/04 16:42:10]

One of the issues I noticed is if the calculation is done every time, for some
reason the children start returning kBookmarkBarHeight (28) and no padding is
added. This renders this code ineffective and the BookmarkBarView doesn't grow.

By caching the value early in the layout process, the BookmarkBarView remains
the right height.

+                         size_animation_.GetCurrentValue()));
   }
   return prefsize;
 }
 
 bool BookmarkBarView::CanProcessEventsWithinSubtree() const {
   // If the bookmark bar is attached and the omnibox popup is open (on top of
   // the bar), prevent events from targeting the bookmark bar or any of its
   // descendants. This will prevent hovers/clicks just above the omnibox popup
   // from activating the top few pixels of items on the bookmark bar.
   if (!IsDetached() && browser_view_ &&
@@ skipping 1307 matching lines @@
     return;
   apps_page_shortcut_->SetVisible(visible);
   UpdateBookmarksSeparatorVisibility();
   LayoutAndPaint();
 }
 
 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() {
   if (UpdateOtherAndManagedButtonsVisibility())
     LayoutAndPaint();
 }