Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1702676 - Fix PreferenceSheet colors, which I forgot to push phab.

Browse Source 
MANUAL PUSH: Orange CLOSED TREE
This commit is contained in:
Emilio Cobos Álvarez 2021-04-02 01:32:04 +02:00
parent 0b9fa22976
commit ad97f9755b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
layout/style/PreferenceSheet.cpp
View File

@ -90,7 +90,8 @@ void PreferenceSheet::Prefs::Load(bool aIsChrome) {
mFocusRingOnAnything = StaticPrefs::browser_display_focus_ring_on_anything();
const bool useStandins = nsContentUtils::UseStandinsForNativeColors();
const bool usePrefColors = !useStandins && !aIsChrome && !mUseAccessibilityTheme &&
const bool usePrefColors = !useStandins && !aIsChrome &&
!mUseAccessibilityTheme &&
!StaticPrefs::browser_display_use_system_colors();
if (usePrefColors) {
GetColor("browser.display.background_color", mDefaultBackgroundColor);
@ -101,13 +102,18 @@ void PreferenceSheet::Prefs::Load(bool aIsChrome) {
const auto standins = LookAndFeel::UseStandins(useStandins);
// TODO(emilio): In the future we probably want to keep both sets of colors
// around or something.
//
// FIXME(emilio): Why do we look at a different set of colors when using
// standins vs. not?
const auto scheme = LookAndFeel::ColorScheme::Light;
mDefaultColor = LookAndFeel::Color(
ColorID::WindowForeground, scheme, standins, mDefaultColor);
useStandins ? ColorID::Windowtext : ColorID::WindowForeground, scheme,
standins, mDefaultColor);
mDefaultBackgroundColor = LookAndFeel::Color(
ColorID::WindowBackground, scheme, standins, mDefaultBackgroundColor);
mLinkColor = LookAndFeel::Color(
ColorID::MozNativehyperlinktext, scheme, standins, mLinkColor);
useStandins ? ColorID::Window : ColorID::WindowBackground, scheme,
standins, mDefaultBackgroundColor);
mLinkColor = LookAndFeel::Color(ColorID::MozNativehyperlinktext, scheme,
standins, mLinkColor);
}
if (mUseAccessibilityTheme && !useStandins) {