Skip to content

Add all Leo skia colors to light and dark color mixers #19440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
petemill wants to merge 1 commit into from
Closed

Add all Leo skia colors to light and dark color mixers #19440

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions browser/ui/color/brave_color_mixer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "chrome/browser/ui/color/chrome_color_id.h"
#include "ui/color/color_id.h"
#include "ui/color/color_provider.h"
#include "ui/color/color_provider_manager.h"
#include "ui/color/color_recipe.h"
#include "ui/gfx/color_palette.h"
#include "ui/gfx/color_utils.h"
Expand Down Expand Up @@ -241,6 +242,20 @@ void AddChromeDarkThemeColorMixer(ui::ColorProvider* provider,
SkColorSetARGB(0x33, 0x16, 0x17, 0x1D)};
}

void AddLeoColorMixer(ui::ColorProvider* provider,
const ui::ColorProviderManager::Key& key) {
auto leo_theme = key.color_mode == ui::ColorProviderManager::ColorMode::kLight
? leo::Theme::kLight
: leo::Theme::kDark;
ui::ColorMixer& mixer = provider->AddMixer();
for (int i = static_cast<int>(leo::Color::kLeoColorsStart);
i != static_cast<int>(leo::Color::kLeoColorsEnd); i++) {
leo::Color color_name = static_cast<leo::Color>(i);
auto color_value = leo::GetColor(color_name, leo_theme);
mixer[static_cast<int>(color_name)] = {color_value};
}
}

} // namespace

SkColor GetLocationBarBackground(bool dark, bool priv, bool hover) {
Expand Down Expand Up @@ -503,6 +518,7 @@ void AddBraveThemeColorMixer(ui::ColorProvider* provider,
key.color_mode == ui::ColorProviderManager::ColorMode::kDark
? AddBraveDarkThemeColorMixer(provider, key)
: AddBraveLightThemeColorMixer(provider, key);
AddLeoColorMixer(provider, key);
#if BUILDFLAG(ENABLE_BRAVE_VPN)
AddBraveVpnColorMixer(provider, key);
#endif
Expand Down