Skip to content

Commit afe75c4

Browse files
committed
helium/ui: fix toolbar padding due to upstream changes
...again
1 parent 58aa698 commit afe75c4

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

patches/helium/ui/experiments/compact-action-toolbar.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
+ // likely layered under window controls, so we accommodate space for
155155
+ // them like a tab strip would.
156156
+ gfx::Rect tab_strip_region_bounds(
157-
+ delegate().GetBoundsForToolbarInVerticalTabBrowserView());
157+
+ delegate().GetBoundsForTabStripRegionInBrowserView());
158158
+ int height = toolbar_visible ? views().toolbar->GetPreferredSize().height() : 0;
159159
+ views().toolbar->SetBounds(tab_strip_region_bounds.x(), available_bounds.y(),
160160
+ tab_strip_region_bounds.width(), height);

patches/helium/ui/fix-caption-button-tab-strip-align.patch

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
--- a/chrome/browser/ui/views/frame/browser_frame_view_mac.mm
2-
+++ b/chrome/browser/ui/views/frame/browser_frame_view_mac.mm
3-
@@ -200,7 +200,7 @@ gfx::Rect BrowserFrameViewMac::GetBounds
4-
// The bottom curve of the first/last tab swoops into the caption button
5-
// region, so account for this when calculating insets.
6-
const gfx::Insets insets = GetCaptionButtonInsets(
7-
- /*visual_overlap=*/TabStyle::Get()->GetBottomCornerRadius());
8-
+ /*visual_overlap=*/TabStyle::Get()->GetBottomCornerRadius() / 2);
9-
bounds.Inset(insets);
10-
}
11-
1+
--- a/chrome/browser/ui/views/frame/layout/browser_view_layout_delegate_impl.cc
2+
+++ b/chrome/browser/ui/views/frame/layout/browser_view_layout_delegate_impl.cc
3+
@@ -258,7 +258,7 @@ BrowserViewLayoutDelegateImpl::GetBounds
4+
layout.trailing_exclusion.vertical_padding);
5+
bounds_f.set_height(
6+
std::max(max_bound, static_cast<float>(tabstrip_minimum_size.height())));
7+
- const int tab_margin = TabStyle::Get()->GetBottomCornerRadius();
8+
+ const int tab_margin = TabStyle::Get()->GetBottomCornerRadius() / 2;
9+
bounds_f.Inset(gfx::InsetsF::TLBR(
10+
0.0f,
11+
layout.leading_exclusion.content.width() +
1212
--- a/chrome/browser/ui/views/frame/browser_frame_view_win.cc
1313
+++ b/chrome/browser/ui/views/frame/browser_frame_view_win.cc
1414
@@ -258,10 +258,13 @@ bool BrowserFrameViewWin::CaptionButtons

0 commit comments

Comments
 (0)