Update shadow layer bounds when tab's layer bounds changes (uplift to…

… 1.51.x) (#18140) Uplift of #18111 (squashed) to beta
brave · Apr 21, 2023 · fed077b · fed077b
1 parent 8768697
commit fed077b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/browser/ui/views/tabs/brave_tab.cc b/browser/ui/views/tabs/brave_tab.cc
@@ -180,6 +180,20 @@ void BraveTab::UpdateIconVisibility() {
   }
 }
 
+void BraveTab::OnLayerBoundsChanged(const gfx::Rect& old_bounds,
+                                    ui::PropertyChangeReason reason) {
+  Tab::OnLayerBoundsChanged(old_bounds, reason);
+
+  if (!base::FeatureList::IsEnabled(tabs::features::kBraveVerticalTabs)) {
+    return;
+  }
+
+  if (shadow_layer_ && shadow_layer_->parent() &&
+      shadow_layer_->parent() == layer()->parent()) {
+    LayoutShadowLayer();
+  }
+}
+
 void BraveTab::Layout() {
   Tab::Layout();
   if (IsAtMinWidthForVerticalTabStrip()) {
@@ -223,14 +237,6 @@ void BraveTab::ReorderChildLayers(ui::Layer* parent_layer) {
   layer()->parent()->StackBelow(shadow_layer_.get(), layer());
 }
 
-void BraveTab::OnBoundsChanged(const gfx::Rect& previous_bounds) {
-  Tab::OnBoundsChanged(previous_bounds);
-
-  if (shadow_layer_ && shadow_layer_->parent()) {
-    LayoutShadowLayer();
-  }
-}
-
 void BraveTab::MaybeAdjustLeftForPinnedTab(gfx::Rect* bounds,
                                            int visual_width) const {
   if (!base::FeatureList::IsEnabled(tabs::features::kBraveVerticalTabs) ||

diff --git a/browser/ui/views/tabs/brave_tab.h b/browser/ui/views/tabs/brave_tab.h
@@ -35,10 +35,12 @@ class BraveTab : public Tab {
   bool ShouldRenderAsNormalTab() const override;
   void Layout() override;
   void ReorderChildLayers(ui::Layer* parent_layer) override;
-  void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   void MaybeAdjustLeftForPinnedTab(gfx::Rect* bounds,
                                    int visual_width) const override;
 
+  void OnLayerBoundsChanged(const gfx::Rect& old_bounds,
+                            ui::PropertyChangeReason reason) override;
+
  private:
   bool IsAtMinWidthForVerticalTabStrip() const;