Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Factor PreferenceSheet colors to its own struct

Browse source 
This will come handy in the next patch.

Depends on D120678

Differential Revision: https://phabricator.services.mozilla.com/D120679
This commit is contained in:
Emilio Cobos Álvarez 2023-05-22 10:11:48 +02:00 • committed by Oriol Brufau
parent c2a50c92fa
commit eca66dba72
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/style/gecko/media_queries.rs
View file

@ -93,7 +93,7 @@ impl Device {
document, document,
default_values: ComputedValues::default_values(doc), default_values: ComputedValues::default_values(doc),
root_font_size: AtomicU32::new(FONT_MEDIUM_PX.to_bits()), root_font_size: AtomicU32::new(FONT_MEDIUM_PX.to_bits()),
body_text_color: AtomicUsize::new(prefs.mDefaultColor as usize), body_text_color: AtomicUsize::new(prefs.mColors.mDefault as usize),
used_root_font_size: AtomicBool::new(false), used_root_font_size: AtomicBool::new(false),
used_font_metrics: AtomicBool::new(false), used_font_metrics: AtomicBool::new(false),
used_viewport_size: AtomicBool::new(false), used_viewport_size: AtomicBool::new(false),
@ -387,12 +387,12 @@ impl Device {
/// Returns the default background color. /// Returns the default background color.
pub fn default_background_color(&self) -> RGBA { pub fn default_background_color(&self) -> RGBA {
convert_nscolor_to_rgba(self.pref_sheet_prefs().mDefaultBackgroundColor) convert_nscolor_to_rgba(self.pref_sheet_prefs().mColors.mDefaultBackground)
} }
/// Returns the default foreground color. /// Returns the default foreground color.
pub fn default_color(&self) -> RGBA { pub fn default_color(&self) -> RGBA {
convert_nscolor_to_rgba(self.pref_sheet_prefs().mDefaultColor) convert_nscolor_to_rgba(self.pref_sheet_prefs().mColors.mDefault)
} }
/// Returns the current effective text zoom. /// Returns the current effective text zoom.

12
components/style/values/specified/color.rs
View file

@ -408,14 +408,14 @@ impl SystemColor {
fn compute(&self, cx: &Context, scheme: SystemColorScheme) -> ComputedColor { fn compute(&self, cx: &Context, scheme: SystemColorScheme) -> ComputedColor {
use crate::gecko_bindings::bindings; use crate::gecko_bindings::bindings;
let prefs = cx.device().pref_sheet_prefs(); let colors = &cx.device().pref_sheet_prefs().mColors;
convert_nscolor_to_computedcolor(match *self { convert_nscolor_to_computedcolor(match *self {
SystemColor::Canvastext => prefs.mDefaultColor, SystemColor::Canvastext => colors.mDefault,
SystemColor::Canvas => prefs.mDefaultBackgroundColor, SystemColor::Canvas => colors.mDefaultBackground,
SystemColor::Linktext => prefs.mLinkColor, SystemColor::Linktext => colors.mLink,
SystemColor::Activetext => prefs.mActiveLinkColor, SystemColor::Activetext => colors.mActiveLink,
SystemColor::Visitedtext => prefs.mVisitedLinkColor, SystemColor::Visitedtext => colors.mVisitedLink,
_ => { _ => {
let color = unsafe { let color = unsafe {