Forward preferred size changes from BraveActionsContainer

When a `BraveAction` is added, the size change isn't properly notified to `BraveLocationBarView`. This commit implements `ChildPreferredSizeChanged()` in both `BraveActionsContainer` and `BraveLocationBarView`, and makes sure the action's preferred size is set after calling `AddChildView()`. Fixes brave/brave-browser#1276
brave · Oct 9, 2018 · c0ab2fd · c0ab2fd
1 parent db19fa4
commit c0ab2fd
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/browser/ui/views/brave_actions/brave_actions_container.cc b/browser/ui/views/brave_actions/brave_actions_container.cc
@@ -105,18 +105,20 @@ void BraveActionsContainer::AddAction(const extensions::Extension* extension,
     // The button view
     actions_[id].view_ = std::make_unique<ToolbarActionView>(
         actions_[id].view_controller_.get(), this);
-    // we control destruction
-    actions_[id].view_->set_owned_by_client();
-    // Sets overall size of button but not image graphic. We set a large width
-    // in order to give space for the bubble.
-    actions_[id].view_->SetPreferredSize(gfx::Size(32, 24));
     // Add extension view after separator view
+    // `AddChildView` should be called first, so that changes that modify
+    // layout (e.g. preferred size) are forwarded to its parent
     if (actions_[id].position_ != ACTION_ANY_POSITION) {
       DCHECK(actions_[id].position_ > 0);
       AddChildViewAt(actions_[id].view_.get(), actions_[id].position_);
     } else {
       AddChildView(actions_[id].view_.get());
     }
+    // we control destruction
+    actions_[id].view_->set_owned_by_client();
+    // Sets overall size of button but not image graphic. We set a large width
+    // in order to give space for the bubble.
+    actions_[id].view_->SetPreferredSize(gfx::Size(32, 24));
     Update();
   }
 }
@@ -244,3 +246,7 @@ void BraveActionsContainer::OnExtensionActionUpdated(
     UpdateActionState(extension_action->extension_id());
 }
 // end ExtensionActionAPI::Observer
+
+void BraveActionsContainer::ChildPreferredSizeChanged(views::View* child) {
+  PreferredSizeChanged();
+}
diff --git a/browser/ui/views/brave_actions/brave_actions_container.h b/browser/ui/views/brave_actions/brave_actions_container.h
@@ -70,6 +70,9 @@ class BraveActionsContainer : public views::View,
         content::WebContents* web_contents,
         content::BrowserContext* browser_context) override;
 
+    // views::View:
+    void ChildPreferredSizeChanged(views::View* child) override;
+
   private:
     // Special positions in the container designators
     enum ActionPosition : int {

diff --git a/browser/ui/views/location_bar/brave_location_bar_view.cc b/browser/ui/views/location_bar/brave_location_bar_view.cc
@@ -100,6 +100,13 @@ void BraveLocationBarView::OnThemeChanged() {
   RefreshBackground();
 }
 
+void BraveLocationBarView::ChildPreferredSizeChanged(views::View* child) {
+  if (child != brave_actions_)
+    return;
+
+  Layout();
+}
+
 // Provide base class implementation for Update override that has been added to
 // header via a patch. This should never be called as the only instantiated
 // implementation should be our |BraveLocationBarView|.

diff --git a/browser/ui/views/location_bar/brave_location_bar_view.h b/browser/ui/views/location_bar/brave_location_bar_view.h
@@ -19,8 +19,11 @@ class BraveLocationBarView : public LocationBarView {
     void Layout() override;
     void Update(const content::WebContents* contents) override;
     void OnChanged() override;
+
+    // views::View:
     gfx::Size CalculatePreferredSize() const override;
     void OnThemeChanged() override;
+    void ChildPreferredSizeChanged(views::View* child) override;
 
   private:
     void UpdateBookmarkStarVisibility() override;