diff --git a/browser/ui/color/brave_color_id.h b/browser/ui/color/brave_color_id.h index 32c363832532..1d6555f3037b 100644 --- a/browser/ui/color/brave_color_id.h +++ b/browser/ui/color/brave_color_id.h @@ -112,6 +112,7 @@ #define BRAVE_VERTICAL_TAB_COLOR_IDS \ E_CPONLY(kColorBraveVerticalTabSeparator) \ E_CPONLY(kColorBraveVerticalTabActiveBackground) \ + E_CPONLY(kColorBraveVerticalTabHoveredBackground) \ E_CPONLY(kColorBraveVerticalTabInactiveBackground) \ E_CPONLY(kColorBraveVerticalTabNTBIconColor) \ E_CPONLY(kColorBraveVerticalTabNTBTextColor) \ diff --git a/browser/ui/tabs/brave_tab_color_mixer.cc b/browser/ui/tabs/brave_tab_color_mixer.cc index 120a3cb9f16d..f2877fd6596e 100644 --- a/browser/ui/tabs/brave_tab_color_mixer.cc +++ b/browser/ui/tabs/brave_tab_color_mixer.cc @@ -22,7 +22,9 @@ void AddBraveTabThemeColorMixer(ui::ColorProvider* provider, auto& mixer = provider->AddMixer(); mixer[kColorBraveVerticalTabActiveBackground] = { - kColorTabBackgroundInactiveFrameActive}; + nala::kColorDesktopbrowserTabbarActiveTabVertical}; + mixer[kColorBraveVerticalTabHoveredBackground] = { + nala::kColorDesktopbrowserTabbarHoverTabVertical}; mixer[kColorBraveVerticalTabInactiveBackground] = {kColorToolbar}; mixer[kColorBraveVerticalTabSeparator] = {kColorToolbarContentAreaSeparator}; mixer[kColorBraveVerticalTabNTBIconColor] = { @@ -61,13 +63,17 @@ void AddBraveTabPrivateThemeColorMixer(ui::ColorProvider* provider, const ui::ColorProviderKey& key) { auto& mixer = provider->AddMixer(); mixer[kColorBraveVerticalTabActiveBackground] = { - mixer.GetResultColor(kColorTabBackgroundActiveFrameActive)}; + nala::kColorPrimitivePrivateWindow30}; mixer[kColorBraveVerticalTabInactiveBackground] = { mixer.GetResultColor(kColorToolbar)}; + mixer[kColorBraveVerticalTabHoveredBackground] = { + ui::AlphaBlend(kColorBraveVerticalTabActiveBackground, + kColorBraveVerticalTabInactiveBackground, + /* 40% opacity */ 0.4 * SK_AlphaOPAQUE)}; mixer[kColorBraveSplitViewTileBackgroundHorizontal] = { nala::kColorPrimitivePrivateWindow10}; mixer[kColorBraveSplitViewTileBackgroundVertical] = { - kColorBraveSplitViewTileBackgroundHorizontal}; + nala::kColorPrimitivePrivateWindow5}; mixer[kColorBraveSplitViewTileDivider] = { nala::kColorPrimitivePrivateWindow20}; } @@ -76,13 +82,17 @@ void AddBraveTabTorThemeColorMixer(ui::ColorProvider* provider, const ui::ColorProviderKey& key) { auto& mixer = provider->AddMixer(); mixer[kColorBraveVerticalTabActiveBackground] = { - mixer.GetResultColor(kColorTabBackgroundActiveFrameActive)}; + nala::kColorPrimitiveTorWindow30}; mixer[kColorBraveVerticalTabInactiveBackground] = { mixer.GetResultColor(kColorToolbar)}; + mixer[kColorBraveVerticalTabHoveredBackground] = { + ui::AlphaBlend(kColorBraveVerticalTabActiveBackground, + kColorBraveVerticalTabInactiveBackground, + /* 40% opacity */ 0.4 * SK_AlphaOPAQUE)}; mixer[kColorBraveSplitViewTileBackgroundHorizontal] = { nala::kColorPrimitiveTorWindow10}; mixer[kColorBraveSplitViewTileBackgroundVertical] = { - kColorBraveSplitViewTileBackgroundHorizontal}; + nala::kColorPrimitiveTorWindow5}; mixer[kColorBraveSplitViewTileDivider] = {nala::kColorPrimitiveTorWindow20}; } diff --git a/browser/ui/views/tabs/brave_tab_style_views.inc.cc b/browser/ui/views/tabs/brave_tab_style_views.inc.cc index 8ac87495e769..f207aa604bd0 100644 --- a/browser/ui/views/tabs/brave_tab_style_views.inc.cc +++ b/browser/ui/views/tabs/brave_tab_style_views.inc.cc @@ -445,11 +445,11 @@ SkColor BraveVerticalTabStyle::GetTargetTabBackgroundColor( } if (tab()->IsActive()) { - return cp->GetColor(nala::kColorDesktopbrowserTabbarActiveTabVertical); + return cp->GetColor(kColorBraveVerticalTabActiveBackground); } if (hovered) { - return cp->GetColor(nala::kColorDesktopbrowserTabbarHoverTabVertical); + return cp->GetColor(kColorBraveVerticalTabHoveredBackground); } if (selection_state == TabStyle::TabSelectionState::kSelected) {