nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1877663 - Don't special-case adwaita colors for the yaru theme. r=stransky

Browse source 
Older versions of the yaru theme had dark titlebars even in light mode
(like yaru-remix).

Instead of getting into the version-detection business, just don't
override with the Adwaita colors.

Differential Revision: https://phabricator.services.mozilla.com/D200362
This commit is contained in:
Emilio Cobos Álvarez 2024-02-02 10:31:02 +00:00
parent 4d1e956920
commit 9e22724a11
2 changed files with 2 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
servo/components/style/gecko/media_features.rs
View file

@ -593,8 +593,6 @@ pub enum GtkThemeFamily {
Breeze,
/// Yaru, the default Ubuntu theme.
Yaru,
/// Yaru-remix, a theme derived from Yaru, but with different titlebar colors.
YaruRemix,
}
fn eval_gtk_theme_family(_: &Context, query_value: Option<GtkThemeFamily>) -> bool {

9
widget/gtk/nsLookAndFeel.cpp
View file

@ -1346,8 +1346,7 @@ void nsLookAndFeel::MaybeApplyAdwaitaOverrides() {
return;
}
if (light.mFamily == ThemeFamily::Adwaita ||
light.mFamily == ThemeFamily::Yaru) {
if (light.mFamily == ThemeFamily::Adwaita) {
// #323232 is rgba(0,0,0,.8) over #fafafa.
light.mWindow =
light.mDialog = {NS_RGB(0xfa, 0xfa, 0xfa), NS_RGB(0x32, 0x32, 0x32)};
@ -1365,8 +1364,7 @@ void nsLookAndFeel::MaybeApplyAdwaitaOverrides() {
light.mSidebarBorder = NS_RGBA(0, 0, 0, 18);
}
if (dark.mFamily == ThemeFamily::Adwaita ||
dark.mFamily == ThemeFamily::Yaru) {
if (dark.mFamily == ThemeFamily::Adwaita) {
dark.mWindow = {NS_RGB(0x24, 0x24, 0x24), NS_RGB(0xff, 0xff, 0xff)};
dark.mDialog = {NS_RGB(0x38, 0x38, 0x38), NS_RGB(0xff, 0xff, 0xff)};
dark.mField = {NS_RGB(0x3a, 0x3a, 0x3a), NS_RGB(0xff, 0xff, 0xff)};
@ -1833,9 +1831,6 @@ void nsLookAndFeel::PerThemeData::Init() {
if (mName.EqualsLiteral("Breeze") || mName.EqualsLiteral("Breeze-Dark")) {
return ThemeFamily::Breeze;
}
if (StringBeginsWith(mName, "Yaru-remix"_ns)) {
return ThemeFamily::YaruRemix;
}
if (StringBeginsWith(mName, "Yaru"_ns)) {
return ThemeFamily::Yaru;
}