mirror of https://github.com/electron/electron
102 lines
5.4 KiB
Diff
102 lines
5.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Mon, 14 Feb 2022 19:24:36 +0900
|
|
Subject: Port autofill colors to the color pipeline.
|
|
|
|
https://chromium-review.googlesource.com/c/chromium/src/+/1652925 removed colors as they are no longer
|
|
needed in chromium but our autofill implementation uses them. This patch can be removed if we refactor
|
|
our autofill implementation to work like Chromium's.
|
|
|
|
diff --git a/ui/color/color_id.h b/ui/color/color_id.h
|
|
index 40817ddda3e9acc6a753f13dd789ceb281ca4080..b8a01f8aa060862076d205350ca55a0d7dcd0b52 100644
|
|
--- a/ui/color/color_id.h
|
|
+++ b/ui/color/color_id.h
|
|
@@ -411,6 +411,10 @@
|
|
E_CPONLY(kColorRadioButtonForegroundUnchecked) \
|
|
E_CPONLY(kColorRadioButtonForegroundDisabled) \
|
|
E_CPONLY(kColorRadioButtonForegroundChecked) \
|
|
+ E_CPONLY(kColorResultsTableNormalBackground) \
|
|
+ E_CPONLY(kColorResultsTableHoveredBackground) \
|
|
+ E_CPONLY(kColorResultsTableNormalText) \
|
|
+ E_CPONLY(kColorResultsTableDimmedText) \
|
|
E_CPONLY(kColorSegmentedButtonBorder) \
|
|
E_CPONLY(kColorSegmentedButtonFocus) \
|
|
E_CPONLY(kColorSegmentedButtonForegroundChecked) \
|
|
@@ -515,6 +519,7 @@
|
|
E_CPONLY(kColorTreeNodeForeground) \
|
|
E_CPONLY(kColorTreeNodeForegroundSelectedFocused) \
|
|
E_CPONLY(kColorTreeNodeForegroundSelectedUnfocused) \
|
|
+ E_CPONLY(kColorUnfocusedBorder) \
|
|
/* These colors are used to paint the controls defined in */ \
|
|
/* ui::NativeThemeBase::ControlColorId. */ \
|
|
E_CPONLY(kColorWebNativeControlAccent) \
|
|
diff --git a/ui/color/ui_color_mixer.cc b/ui/color/ui_color_mixer.cc
|
|
index b4893b65b0955a76c8f4fb2d16ec21bfabe602b7..936462132d2c37a69272e11f922bcdcd71d426b9 100644
|
|
--- a/ui/color/ui_color_mixer.cc
|
|
+++ b/ui/color/ui_color_mixer.cc
|
|
@@ -200,6 +200,17 @@ void AddUiColorMixer(ColorProvider* provider, const ColorProviderKey& key) {
|
|
mixer[kColorProgressBarPaused] = {kColorDisabledForeground};
|
|
mixer[kColorRadioButtonForegroundChecked] = {kColorButtonForeground};
|
|
mixer[kColorRadioButtonForegroundUnchecked] = {kColorSecondaryForeground};
|
|
+ mixer[kColorResultsTableNormalBackground] = {SK_ColorWHITE};
|
|
+ mixer[kColorResultsTableHoveredBackground] =
|
|
+ SetAlpha(kColorResultsTableNormalText, 0x0D);
|
|
+ mixer[kColorResultsTableNormalText] = {SK_ColorBLACK};
|
|
+ mixer[kColorResultsTableDimmedText] = {SkColorSetRGB(0x64, 0x64, 0x64)};
|
|
+ if (dark_mode) {
|
|
+ mixer[kColorResultsTableNormalBackground] = {SkColorSetRGB(0x28, 0x28, 0x28)};
|
|
+ mixer[kColorResultsTableNormalText] = {SK_ColorWHITE};
|
|
+ mixer[kColorResultsTableDimmedText] =
|
|
+ SetAlpha(kColorResultsTableNormalText, 0x80);
|
|
+ }
|
|
mixer[kColorSeparator] = {kColorMidground};
|
|
mixer[kColorShadowBase] = {dark_mode ? SK_ColorBLACK : gfx::kGoogleGrey800};
|
|
mixer[kColorShadowValueAmbientShadowElevationThree] =
|
|
@@ -311,6 +322,7 @@ void AddUiColorMixer(ColorProvider* provider, const ColorProviderKey& key) {
|
|
mixer[kColorTreeNodeForegroundSelectedFocused] = {kColorTreeNodeForeground};
|
|
mixer[kColorTreeNodeForegroundSelectedUnfocused] = {
|
|
kColorTreeNodeForegroundSelectedFocused};
|
|
+ mixer[kColorUnfocusedBorder] = {kColorMidground};
|
|
mixer[kColorWebNativeControlAccent] = {dark_mode
|
|
? SkColorSetRGB(0x99, 0xC8, 0xFF)
|
|
: SkColorSetRGB(0x00, 0x75, 0xFF)};
|
|
diff --git a/ui/color/win/native_color_mixers_win.cc b/ui/color/win/native_color_mixers_win.cc
|
|
index 02ac937e8bdf054fa516ad25714e60f32f452342..9c55f5fa27fdcf4192b18c8234f8b117d5cd26be 100644
|
|
--- a/ui/color/win/native_color_mixers_win.cc
|
|
+++ b/ui/color/win/native_color_mixers_win.cc
|
|
@@ -172,6 +172,10 @@ void AddNativeUiColorMixer(ColorProvider* provider,
|
|
SetAlpha(kColorNotificationInputForeground, gfx::kGoogleGreyAlpha700);
|
|
mixer[kColorSliderTrack] = AlphaBlend(
|
|
kColorNativeHighlight, kColorNativeWindow, gfx::kGoogleGreyAlpha400);
|
|
+ mixer[kColorResultsTableHoveredBackground] = AlphaBlend(
|
|
+ kColorNativeHighlight, kColorNativeWindow, gfx::kGoogleGreyAlpha400);
|
|
+ mixer[kColorResultsTableDimmedText] = AlphaBlend(
|
|
+ kColorNativeWindowText, kColorNativeWindow, gfx::kGoogleGreyAlpha600);
|
|
|
|
// Window Background
|
|
mixer[kColorBubbleFooterBackground] = {kColorNativeWindow};
|
|
@@ -180,6 +184,7 @@ void AddNativeUiColorMixer(ColorProvider* provider,
|
|
mixer[kColorFrameInactive] = {kColorNativeWindow};
|
|
mixer[kColorPrimaryBackground] = {kColorNativeWindow};
|
|
mixer[kColorTooltipBackground] = {kColorNativeWindow};
|
|
+ mixer[kColorResultsTableNormalBackground] = {kColorNativeWindow};
|
|
|
|
// Window Text
|
|
mixer[kColorAlertLowSeverity] = {kColorNativeWindowText};
|
|
@@ -193,6 +198,7 @@ void AddNativeUiColorMixer(ColorProvider* provider,
|
|
mixer[kColorTableGroupingIndicator] = {kColorNativeWindowText};
|
|
mixer[kColorThrobber] = {kColorNativeWindowText};
|
|
mixer[kColorTooltipForeground] = {kColorNativeWindowText};
|
|
+ mixer[kColorResultsTableNormalText] = {kColorNativeWindowText};
|
|
|
|
// Hyperlinks
|
|
mixer[kColorLinkForegroundDefault] = {kColorNativeHotlight};
|
|
@@ -236,6 +242,7 @@ void AddNativeUiColorMixer(ColorProvider* provider,
|
|
mixer[kColorTextfieldForeground] = {kColorNativeBtnText};
|
|
mixer[kColorTextfieldForegroundPlaceholder] = {kColorNativeBtnText};
|
|
mixer[kColorTextfieldForegroundDisabled] = {kColorNativeBtnText};
|
|
+ mixer[kColorUnfocusedBorder] = {kColorNativeBtnText};
|
|
|
|
// Highlight/Selected Background
|
|
mixer[kColorAccent] = {kColorNativeHighlight};
|