Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: enable customizing symbolColor
- Loading branch information
1 parent
b0230d2
commit 852dcea
Showing
5 changed files
with
148 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
patches/chromium/feat_enable_customizing_symbol_color_in_framecaptionbutton.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Shelley Vohr <shelley.vohr@gmail.com> | ||
| Date: Fri, 5 Apr 2024 11:07:22 +0200 | ||
| Subject: feat: enable customizing symbol color in FrameCaptionButton | ||
|
|
||
| This enables customizing the symbol color on a given FrameCaptionButton | ||
| for the Window Controls Overlay API on Linux. By default, the symbol color | ||
| is dynamically calculated based on the background color of the button to | ||
| ensure it has minimum contrast required to be accessible. | ||
|
|
||
| This should be upstreamed to Chromium if possible. | ||
|
|
||
| diff --git a/ui/views/window/frame_caption_button.cc b/ui/views/window/frame_caption_button.cc | ||
| index 73e6020e3b9b6e0d12a8dea991f189b3ddeab14c..52c273b3dee06bf996bbc997e3c8ca266c1994ba 100644 | ||
| --- a/ui/views/window/frame_caption_button.cc | ||
| +++ b/ui/views/window/frame_caption_button.cc | ||
| @@ -108,6 +108,10 @@ FrameCaptionButton::~FrameCaptionButton() = default; | ||
|
|
||
| // static | ||
| SkColor FrameCaptionButton::GetButtonColor(SkColor background_color) { | ||
| + // If the button color has been overridden, return that. | ||
| + if (button_color_ != SkColor()) | ||
| + return button_color_; | ||
| + | ||
| // Use IsDark() to change target colors instead of PickContrastingColor(), so | ||
| // that DefaultFrameHeader::GetTitleColor() (which uses different target | ||
| // colors) can change between light/dark targets at the same time. It looks | ||
| @@ -124,6 +128,11 @@ SkColor FrameCaptionButton::GetButtonColor(SkColor background_color) { | ||
| .color; | ||
| } | ||
|
|
||
| +// static | ||
| +SkColor FrameCaptionButton::SetButtonColor(SkColor button_color) { | ||
| + button_color_ = button_color; | ||
| +} | ||
| + | ||
| // static | ||
| float FrameCaptionButton::GetInactiveButtonColorAlphaRatio() { | ||
| return 0.38f; | ||
| @@ -135,10 +144,10 @@ void FrameCaptionButton::SetImage(CaptionButtonIcon icon, | ||
| // If the button is not yet in a widget, OnThemeChanged() will call back | ||
| // here once it is, updating the color as needed. | ||
| SkColor icon_color = gfx::kPlaceholderColor; | ||
| - if (absl::holds_alternative<SkColor>(color_)) { | ||
| - icon_color = GetButtonColor(absl::get<SkColor>(color_)); | ||
| + if (absl::holds_alternative<SkColor>(background_color_)) { | ||
| + icon_color = GetButtonColor(absl::get<SkColor>(background_color_)); | ||
| } else if (const auto* color_provider = GetColorProvider()) { | ||
| - icon_color = color_provider->GetColor(absl::get<ui::ColorId>(color_)); | ||
| + icon_color = color_provider->GetColor(absl::get<ui::ColorId>(background_color_)); | ||
| } | ||
|
|
||
| gfx::ImageSkia new_icon_image = | ||
| @@ -213,27 +222,27 @@ views::PaintInfo::ScaleType FrameCaptionButton::GetPaintScaleType() const { | ||
| } | ||
|
|
||
| void FrameCaptionButton::SetBackgroundColor(SkColor background_color) { | ||
| - if (absl::holds_alternative<SkColor>(color_) && | ||
| - absl::get<SkColor>(color_) == background_color) { | ||
| + if (absl::holds_alternative<SkColor>(background_color_) && | ||
| + absl::get<SkColor>(background_color_) == background_color) { | ||
| return; | ||
| } | ||
|
|
||
| - color_ = background_color; | ||
| + background_color_ = background_color; | ||
| MaybeRefreshIconAndInkdropBaseColor(); | ||
| } | ||
|
|
||
| void FrameCaptionButton::SetIconColorId(ui::ColorId icon_color_id) { | ||
| - if (absl::holds_alternative<ui::ColorId>(color_) && | ||
| - absl::get<ui::ColorId>(color_) == icon_color_id) { | ||
| + if (absl::holds_alternative<ui::ColorId>(background_color_) && | ||
| + absl::get<ui::ColorId>(background_color_) == icon_color_id) { | ||
| return; | ||
| } | ||
|
|
||
| - color_ = icon_color_id; | ||
| + background_color_ = icon_color_id; | ||
| MaybeRefreshIconAndInkdropBaseColor(); | ||
| } | ||
|
|
||
| SkColor FrameCaptionButton::GetBackgroundColor() const { | ||
| - return absl::get<SkColor>(color_); | ||
| + return absl::get<SkColor>(background_color_); | ||
| } | ||
|
|
||
| void FrameCaptionButton::SetInkDropCornerRadius(int ink_drop_corner_radius) { | ||
| @@ -250,7 +259,7 @@ int FrameCaptionButton::GetInkDropCornerRadius() const { | ||
| base::CallbackListSubscription | ||
| FrameCaptionButton::AddBackgroundColorChangedCallback( | ||
| PropertyChangedCallback callback) { | ||
| - return AddPropertyChangedCallback(&color_, callback); | ||
| + return AddPropertyChangedCallback(&background_color_, callback); | ||
| } | ||
|
|
||
| void FrameCaptionButton::SetPaintAsActive(bool paint_as_active) { | ||
| @@ -394,9 +403,9 @@ void FrameCaptionButton::UpdateInkDropBaseColor() { | ||
| // TODO(pkasting): It would likely be better to make the button glyph always | ||
| // be an alpha-blended version of GetColorWithMaxContrast(background_color_). | ||
| const SkColor button_color = | ||
| - absl::holds_alternative<ui::ColorId>(color_) | ||
| - ? GetColorProvider()->GetColor(absl::get<ui::ColorId>(color_)) | ||
| - : GetButtonColor(absl::get<SkColor>(color_)); | ||
| + absl::holds_alternative<ui::ColorId>(background_color_) | ||
| + ? GetColorProvider()->GetColor(absl::get<ui::ColorId>(background_color_)) | ||
| + : GetButtonColor(absl::get<SkColor>(background_color_)); | ||
|
|
||
| InkDrop::Get(this)->SetBaseColor( | ||
| GetColorWithMaxContrast(GetColorWithMaxContrast(button_color))); | ||
| diff --git a/ui/views/window/frame_caption_button.h b/ui/views/window/frame_caption_button.h | ||
| index 0d20ec5891d08187b4dae7a6b46a9a6de2f7c39c..a7db2a33319cd60d8017d1e617c963781d8d0243 100644 | ||
| --- a/ui/views/window/frame_caption_button.h | ||
| +++ b/ui/views/window/frame_caption_button.h | ||
| @@ -46,6 +46,12 @@ class VIEWS_EXPORT FrameCaptionButton : public Button { | ||
| // Gets the color to use for a frame caption button. | ||
| static SkColor GetButtonColor(SkColor background_color); | ||
|
|
||
| + // Sets the color to use for a frame caption button. | ||
| + // The color is by default calculated to be an accessible contrast | ||
| + // to the background color, so you should keep that in mind when | ||
| + // overriding that behavior. | ||
| + static SkColor SetButtonColor(SkColor button_color); | ||
| + | ||
| // Gets the alpha ratio for the colors of inactive frame caption buttons. | ||
| static float GetInactiveButtonColorAlphaRatio(); | ||
|
|
||
| @@ -132,7 +138,8 @@ class VIEWS_EXPORT FrameCaptionButton : public Button { | ||
| // id. | ||
| // TODO(b/292154873): Store the foreground color instead of the background | ||
| // color for the SkColor type. | ||
| - absl::variant<ui::ColorId, SkColor> color_ = gfx::kPlaceholderColor; | ||
| + absl::variant<ui::ColorId, SkColor> background_color_ = gfx::kPlaceholderColor; | ||
| + SkColor button_color_ = SkColor(); | ||
|
|
||
| // Whether the button should be painted as active. | ||
| bool paint_as_active_ = false; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters