From ac863716ddab324299bc6ffbf919fb2af64c32ce Mon Sep 17 00:00:00 2001 From: wukko Date: Thu, 4 Dec 2025 16:20:25 +0600 Subject: [PATCH] helium/cat: prevent pinned extensions from shrinking --- .../ui/experiments/compact-action-toolbar.patch | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/patches/helium/ui/experiments/compact-action-toolbar.patch b/patches/helium/ui/experiments/compact-action-toolbar.patch index 014d4b52..f1282fd7 100644 --- a/patches/helium/ui/experiments/compact-action-toolbar.patch +++ b/patches/helium/ui/experiments/compact-action-toolbar.patch @@ -197,7 +197,7 @@ show_avatar_button_.Init( prefs::kShowAvatarButton, prefs, base::BindRepeating(&ToolbarView::OnShowAvatarButtonChanged, -@@ -573,12 +596,24 @@ void ToolbarView::Init() { +@@ -573,12 +596,27 @@ void ToolbarView::Init() { InitLayout(); @@ -213,16 +213,19 @@ } } + -+ // Pinned actions (including downloads) should not shrink in CAT layout. ++ // Pinned actions (including downloads) and extensions ++ // should not shrink in CAT layout. + if (features::IsHeliumCatEnabled()) { + pinned_toolbar_actions_container_->SetProperty( + views::kFlexBehaviorKey, flex_preferred); ++ extensions_container_->SetProperty( ++ views::kFlexBehaviorKey, flex_preferred); + } + if (browser_view_->GetSupportsTabStrip()) { browser()->GetTabStripModel()->AddObserver(this); } -@@ -703,6 +738,24 @@ bool ToolbarView::IsRectInWindowCaption( +@@ -703,6 +741,24 @@ bool ToolbarView::IsRectInWindowCaption( return gfx::ToEnclosingRect(rect_in_target_coords_f); }; @@ -247,7 +250,7 @@ // Check each child view in container_view_ to see if the rect intersects with // any clickable elements. If it does, check if the click is actually on that // element. False if on a clickable element, true if not on a clickable element. -@@ -982,8 +1035,12 @@ void ToolbarView::InitLayout() { +@@ -982,8 +1038,12 @@ void ToolbarView::InitLayout() { constexpr int kToolbarActionsFlexOrder = kOrderOffset + 2; constexpr int kExtensionsFlexOrder = kOrderOffset + 3; @@ -261,7 +264,7 @@ views::MaximumFlexSizeRule::kUnbounded) .WithOrder(kLocationBarFlexOrder); -@@ -999,6 +1056,12 @@ void ToolbarView::InitLayout() { +@@ -999,6 +1059,12 @@ void ToolbarView::InitLayout() { location_bar_->SetProperty(views::kMarginsKey, gfx::Insets::VH(0, location_bar_margin));