mirror of
https://github.com/morgan9e/helium
synced 2026-04-14 00:14:20 +09:00
helium/ui: fix toolbar padding due to upstream changes
...again
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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<float>(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
|
||||
|
||||
Reference in New Issue
Block a user