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

Bug 1849480 - Try to avoid unsuccessful theme switches when looking for alt theme. r=stransky

Browse source 
If you have something like Adwaita-dark, switching prefers-dark-theme is
useless. Try to first find a named light theme. Only if that fails try
to switch prefers-dark-theme.

Differential Revision: https://phabricator.services.mozilla.com/D187393
This commit is contained in:
Emilio Cobos Álvarez 2023-09-05 09:39:32 +00:00
parent 46c7aa1517
commit a5071b4fe1
2 changed files with 40 additions and 27 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

65
widget/gtk/nsLookAndFeel.cpp
View file

@ -1219,22 +1219,13 @@ static bool AnyColorChannelIsDifferent(nscolor aColor) {
NS_GET_R(aColor) != NS_GET_B(aColor);
}
void nsLookAndFeel::ConfigureAndInitializeAltTheme() {
bool nsLookAndFeel::ConfigureAltTheme() {
GtkSettings* settings = gtk_settings_get_default();
bool fellBackToDefaultTheme = false;
// Try to select the opposite variant of the current theme first...
LOGLNF(" toggling gtk-application-prefer-dark-theme\n");
g_object_set(settings, "gtk-application-prefer-dark-theme",
!mSystemTheme.mIsDark, nullptr);
moz_gtk_refresh();
// Toggling gtk-application-prefer-dark-theme is not enough generally to
// switch from dark to light theme. If the theme didn't change, and we have
// a dark theme, try to first remove -Dark{,er,est} from the theme name to
// find the light variant.
if (mSystemTheme.mIsDark && mSystemTheme.mIsDark == GetThemeIsDark()) {
if (mSystemTheme.mIsDark) {
nsCString potentialLightThemeName = mSystemTheme.mName;
// clang-format off
constexpr nsLiteralCString kSubstringsToRemove[] = {
@ -1245,7 +1236,7 @@ void nsLookAndFeel::ConfigureAndInitializeAltTheme() {
};
// clang-format on
bool found = false;
for (auto& s : kSubstringsToRemove) {
for (const auto& s : kSubstringsToRemove) {
potentialLightThemeName = mSystemTheme.mName;
potentialLightThemeName.ReplaceSubstring(s, ""_ns);
if (potentialLightThemeName.Length() != mSystemTheme.mName.Length()) {
@ -1254,30 +1245,50 @@ void nsLookAndFeel::ConfigureAndInitializeAltTheme() {
}
}
if (found) {
LOGLNF(" found potential light variant of %s: %s",
mSystemTheme.mName.get(), potentialLightThemeName.get());
g_object_set(settings, "gtk-theme-name", potentialLightThemeName.get(),
"gtk-application-prefer-dark-theme", !mSystemTheme.mIsDark,
nullptr);
moz_gtk_refresh();
if (!GetThemeIsDark()) {
return true; // Success!
}
}
}
if (mSystemTheme.mIsDark == GetThemeIsDark()) {
// If the theme still didn't change enough, fall back to Adwaita with the
// appropriate color preference.
g_object_set(settings, "gtk-theme-name", "Adwaita",
"gtk-application-prefer-dark-theme", !mSystemTheme.mIsDark,
nullptr);
LOGLNF(" toggling gtk-application-prefer-dark-theme");
g_object_set(settings, "gtk-application-prefer-dark-theme",
!mSystemTheme.mIsDark, nullptr);
moz_gtk_refresh();
if (mSystemTheme.mIsDark != GetThemeIsDark()) {
return true; // Success!
}
LOGLNF(" didn't work, falling back to default theme");
// If the theme still didn't change enough, fall back to Adwaita with the
// appropriate color preference.
g_object_set(settings, "gtk-theme-name", "Adwaita",
"gtk-application-prefer-dark-theme", !mSystemTheme.mIsDark,
nullptr);
moz_gtk_refresh();
// If it _still_ didn't change enough, and we're looking for a dark theme,
// try to set Adwaita-dark as a theme name. This might be needed in older GTK
// versions.
if (!mSystemTheme.mIsDark && !GetThemeIsDark()) {
LOGLNF(" last resort Adwaita-dark fallback");
g_object_set(settings, "gtk-theme-name", "Adwaita-dark", nullptr);
moz_gtk_refresh();
// If it _still_ didn't change enough, and we're dark, try to set
// Adwaita-dark as a theme name. This might be needed in older GTK versions.
if (!mSystemTheme.mIsDark && !GetThemeIsDark()) {
g_object_set(settings, "gtk-theme-name", "Adwaita-dark", nullptr);
moz_gtk_refresh();
}
fellBackToDefaultTheme = true;
}
return false;
}
void nsLookAndFeel::ConfigureAndInitializeAltTheme() {
const bool fellBackToDefaultTheme = !ConfigureAltTheme();
mAltTheme.Init();
// Some of the alt theme colors we can grab from the system theme, if we fell

2
widget/gtk/nsLookAndFeel.h
View file

@ -185,6 +185,8 @@ class nsLookAndFeel final : public nsXPLookAndFeel {
void RestoreSystemTheme();
void InitializeGlobalSettings();
// Returns whether we found an alternative theme.
bool ConfigureAltTheme();
void ConfigureAndInitializeAltTheme();
void ConfigureFinalEffectiveTheme();
};