Skip to content
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

Jump to bottom

[Nala]: Fix Omnibox highlights and vertical tab separator with custom dark theme #25547

Merged
merged 1 commit into from
Sep 16, 2024
Merged

[Nala]: Fix Omnibox highlights and vertical tab separator with custom dark theme #25547

Show file tree
Hide file tree
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
5 changes: 2 additions & 3 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 @@ -693,7 +693,8 @@ void AddBraveOmniboxColorMixer(ui::ColorProvider* provider,
const ui::ColorProviderKey& key) {
ui::ColorMixer& mixer = provider->AddMixer();

mixer[kColorBraveOmniboxResultViewSeparator] = {nala::kColorDividerSubtle};
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its not safe to use Nala theme variables without checking for a custom theme, unfortunately 😢

mixer[kColorBraveOmniboxResultViewSeparator] = {
kColorToolbarContentAreaSeparator};
mixer[kColorOmniboxResultsUrl] = {nala::kColorTextInteractive};
// We use a shadow for the Omnibox hover effect, rather than a color change.
mixer[kColorLocationBarBackgroundHovered] = {kColorLocationBarBackground};
Expand All @@ -702,8 +703,6 @@ void AddBraveOmniboxColorMixer(ui::ColorProvider* provider,

// We don't use bg color for location icon view.
mixer[kColorPageInfoBackground] = {SK_ColorTRANSPARENT};

AddOmniboxHoverSelect(mixer);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We now take the Chromium colors which is much simpler - we still need this for Private/Tor

}

void AddBravifiedTabStripColorMixer(ui::ColorProvider* provider,
Expand Down
2 changes: 1 addition & 1 deletion browser/ui/tabs/brave_tab_color_mixer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ void AddBraveTabThemeColorMixer(ui::ColorProvider* provider,
mixer[kColorBraveVerticalTabActiveBackground] = {
kColorTabBackgroundInactiveFrameActive};
mixer[kColorBraveVerticalTabInactiveBackground] = {kColorToolbar};
mixer[kColorBraveVerticalTabSeparator] = {nala::kColorDividerSubtle};
mixer[kColorBraveVerticalTabSeparator] = {kColorToolbarContentAreaSeparator};
mixer[kColorBraveVerticalTabNTBIconColor] = {
kColorTabForegroundInactiveFrameActive};
mixer[kColorBraveVerticalTabNTBTextColor] = {
Expand Down
Loading