Give 4px gap between split view tile and others

brave · Dec 19, 2024 · f992d89 · f992d89
1 parent 9219ea5
commit f992d89
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/browser/ui/views/tabs/brave_tab_container.cc b/browser/ui/views/tabs/brave_tab_container.cc
@@ -15,6 +15,7 @@
 #include "base/containers/flat_map.h"
 #include "base/feature_list.h"
 #include "brave/browser/ui/color/brave_color_id.h"
+#include "brave/browser/ui/tabs/brave_tab_layout_constants.h"
 #include "brave/browser/ui/tabs/brave_tab_prefs.h"
 #include "brave/browser/ui/tabs/features.h"
 #include "brave/browser/ui/tabs/split_view_browser_data.h"
@@ -309,10 +310,8 @@ void BraveTabContainer::PaintBoundingBoxForTile(gfx::Canvas& canvas,
   // implementations in compound_tab_container.cc implementation. Thus, we need
   // to add pinned tab count.
   auto* tab_strip_model = tab_slot_controller_->GetBrowser()->tab_strip_model();
-  const bool is_pinned_tab_container =
-      tabs_view_model_.view_at(0)->data().pinned;
   const int offset =
-      is_pinned_tab_container ? 0 : tab_strip_model->IndexOfFirstNonPinnedTab();
+      IsPinnedTabContainer() ? 0 : tab_strip_model->IndexOfFirstNonPinnedTab();
 
   auto tab1_index = tab_strip_model->GetIndexOfTab(tile.first) - offset;
   auto tab2_index = tab_strip_model->GetIndexOfTab(tile.second) - offset;
@@ -334,11 +333,11 @@ void BraveTabContainer::PaintBoundingBoxForTile(gfx::Canvas& canvas,
     // In order to make margin between the bounding box and tab strip.
     // Need to compensate the amount of overlap because it's hidden by overlap
     // at bottom.
-    constexpr int kVerticalMargin = 2;
-    const int margin_bottom =
-        kVerticalMargin + GetLayoutConstant(TABSTRIP_TOOLBAR_OVERLAP);
-    bounding_rects.Inset(
-        gfx::Insets::TLBR(kVerticalMargin, 0, margin_bottom, 0));
+    int vertical_margin = GetTabAtModelIndex(tab1_index)->data().pinned ? 4 : 2;
+    bounding_rects.Inset(gfx::Insets::TLBR(
+        vertical_margin, brave_tabs::kHorizontalTabInset,
+        vertical_margin + GetLayoutConstant(TABSTRIP_TOOLBAR_OVERLAP),
+        brave_tabs::kHorizontalTabInset));
   }
 
   constexpr auto kRadius = 12.f;  // same value with --leo-radius-l
@@ -781,6 +780,9 @@ void BraveTabContainer::UpdateTabsBorderInTile(const TabTile& tile) {
 
   auto* tab1 = GetTabAtModelIndex(tab1_index);
   auto* tab2 = GetTabAtModelIndex(tab2_index);
+
+  // Tab's border varies per split view state.
+  // See BraveVerticalTabStyle::GetContentsInsets().
   tab1->UpdateBorder();
   tab2->UpdateBorder();
 }

diff --git a/browser/ui/views/tabs/brave_tab_style_views.inc.cc b/browser/ui/views/tabs/brave_tab_style_views.inc.cc
@@ -232,10 +232,7 @@ SkPath BraveVerticalTabStyle::GetPath(
       tab_top += scale * kAdditionalVerticalPadding;
       tab_bottom -= scale * kAdditionalVerticalPadding;
 
-      constexpr int kTotalHorizontalPaddingForHorizontalTab = 4;
-      constexpr int kAdditionalHorizontalPadding =
-          kTotalHorizontalPaddingForHorizontalTab -
-          brave_tabs::kHorizontalTabInset;
+      constexpr int kAdditionalHorizontalPadding = 4;
       tab()->controller()->IsFirstTabInTile(tab())
           ? tab_left += scale* kAdditionalHorizontalPadding
           : tab_right -= scale * kAdditionalHorizontalPadding;