Skip to content

Cr124 modal text color (uplift to 1.65.x) #23055

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

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Cr124 modal text color (uplift to 1.65.x) #23055

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
35 changes: 22 additions & 13 deletions chromium_src/ui/color/material_ui_color_mixer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "ui/color/material_ui_color_mixer.h"

#define AddMaterialUiColorMixer AddMaterialUiColorMixer_Chromium
#define AddMaterialUiColorMixer AddMaterialUiColorMixer_UnUsed

#include "src/ui/color/material_ui_color_mixer.cc"
#include "ui/gfx/color_palette.h"
Expand All @@ -14,25 +14,34 @@

namespace ui {

namespace {

void AddBraveMaterialUiColorMixer(ColorProvider* provider,
const ColorProviderKey& key) {
void AddMaterialUiColorMixer(ColorProvider* provider,
const ColorProviderKey& key) {
ui::ColorMixer& mixer = provider->AddMixer();
const bool is_dark = key.color_mode == ui::ColorProviderKey::ColorMode::kDark;
mixer[ui::kColorListItemUrlFaviconBackground] = {
is_dark ? gfx::kGoogleGrey800 : gfx::kGoogleGrey050};
mixer[ui::kColorToggleButtonHover] = {is_dark
? SkColorSetRGB(0x44, 0x36, 0xE1)
: SkColorSetRGB(0x4C, 0x54, 0xD2)};
}

} // namespace

void AddMaterialUiColorMixer(ColorProvider* provider,
const ColorProviderKey& key) {
AddMaterialUiColorMixer_Chromium(provider, key);
AddBraveMaterialUiColorMixer(provider, key);
mixer[ui::kColorComboboxInkDropHovered] = {ui::kColorSysStateHoverOnSubtle};
mixer[ui::kColorComboboxInkDropRipple] = {
ui::kColorSysStateRippleNeutralOnSubtle};
mixer[ui::kColorToastBackground] = {ui::kColorSysInverseSurface};
mixer[ui::kColorToastButton] = {ui::kColorSysInversePrimary};
mixer[ui::kColorToastForeground] = {ui::kColorSysInverseOnSurface};
mixer[ui::kColorToggleButtonHover] = {ui::kColorSysStateHover};
mixer[ui::kColorToggleButtonPressed] = {ui::kColorSysStatePressed};
mixer[ui::kColorToggleButtonShadow] = {ui::kColorSysOutline};
mixer[ui::kColorToggleButtonThumbOff] = {ui::kColorSysOutline};
mixer[ui::kColorToggleButtonThumbOffDisabled] = {ui::kColorSysStateDisabled};
mixer[ui::kColorToggleButtonThumbOn] = {ui::kColorSysOnPrimary};
mixer[ui::kColorToggleButtonThumbOnDisabled] = {ui::kColorSysSurface};
mixer[ui::kColorToggleButtonThumbOnHover] = {ui::kColorSysPrimaryContainer};
mixer[ui::kColorToggleButtonTrackOff] = {ui::kColorSysSurfaceVariant};
mixer[ui::kColorToggleButtonTrackOffDisabled] = {ui::kColorSysSurfaceVariant};
mixer[ui::kColorToggleButtonTrackOn] = {ui::kColorSysPrimary};
mixer[ui::kColorToggleButtonTrackOnDisabled] = {
ui::kColorSysStateDisabledContainer};
}

} // namespace ui
Loading