From a749a3e3e2a8ecf525316e98452efae411091043 Mon Sep 17 00:00:00 2001 From: wukko Date: Wed, 3 Dec 2025 00:49:18 +0600 Subject: [PATCH] helium/ui: fix toolbar padding due to upstream changes ...again --- .../experiments/compact-action-toolbar.patch | 2 +- .../fix-caption-button-tab-strip-align.patch | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/patches/helium/ui/experiments/compact-action-toolbar.patch b/patches/helium/ui/experiments/compact-action-toolbar.patch index 6b9eaa0d..9fdb662c 100644 --- a/patches/helium/ui/experiments/compact-action-toolbar.patch +++ b/patches/helium/ui/experiments/compact-action-toolbar.patch @@ -144,7 +144,7 @@ + // likely layered under window controls, so we accommodate space for + // them like a tab strip would. + gfx::Rect tab_strip_region_bounds( -+ delegate().GetBoundsForToolbarInVerticalTabBrowserView()); ++ delegate().GetBoundsForTabStripRegionInBrowserView()); + int height = toolbar_visible ? views().toolbar->GetPreferredSize().height() : 0; + views().toolbar->SetBounds(tab_strip_region_bounds.x(), available_bounds.y(), + tab_strip_region_bounds.width(), height); diff --git a/patches/helium/ui/fix-caption-button-tab-strip-align.patch b/patches/helium/ui/fix-caption-button-tab-strip-align.patch index d94b098c..edb25374 100644 --- a/patches/helium/ui/fix-caption-button-tab-strip-align.patch +++ b/patches/helium/ui/fix-caption-button-tab-strip-align.patch @@ -1,14 +1,14 @@ ---- a/chrome/browser/ui/views/frame/browser_frame_view_mac.mm -+++ b/chrome/browser/ui/views/frame/browser_frame_view_mac.mm -@@ -200,7 +200,7 @@ gfx::Rect BrowserFrameViewMac::GetBounds - // The bottom curve of the first/last tab swoops into the caption button - // region, so account for this when calculating insets. - const gfx::Insets insets = GetCaptionButtonInsets( -- /*visual_overlap=*/TabStyle::Get()->GetBottomCornerRadius()); -+ /*visual_overlap=*/TabStyle::Get()->GetBottomCornerRadius() / 2); - bounds.Inset(insets); - } - +--- a/chrome/browser/ui/views/frame/layout/browser_view_layout_delegate_impl.cc ++++ b/chrome/browser/ui/views/frame/layout/browser_view_layout_delegate_impl.cc +@@ -258,7 +258,7 @@ BrowserViewLayoutDelegateImpl::GetBounds + layout.trailing_exclusion.vertical_padding); + bounds_f.set_height( + std::max(max_bound, static_cast(tabstrip_minimum_size.height()))); +- const int tab_margin = TabStyle::Get()->GetBottomCornerRadius(); ++ const int tab_margin = TabStyle::Get()->GetBottomCornerRadius() / 2; + bounds_f.Inset(gfx::InsetsF::TLBR( + 0.0f, + layout.leading_exclusion.content.width() + --- a/chrome/browser/ui/views/frame/browser_frame_view_win.cc +++ b/chrome/browser/ui/views/frame/browser_frame_view_win.cc @@ -258,10 +258,13 @@ bool BrowserFrameViewWin::CaptionButtons