From 41c26daba2320581fe5471d79ee9d29f5f4c9f15 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval Date: Sun, 25 Feb 2024 10:36:44 +0100 Subject: [PATCH] image: Use const for RGBA::new --- src/widgets/image.rs | 15 +++++++-------- src/widgets/image/background_color.rs | 8 ++++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/widgets/image.rs b/src/widgets/image.rs index 6d0a449..7ac0fa1 100644 --- a/src/widgets/image.rs +++ b/src/widgets/image.rs @@ -60,17 +60,16 @@ use crate::util::Gesture; /// Default background color around images and behind transparent images /// `#242424` -static BACKGROUND_COLOR_DEFAULT: Lazy = - Lazy::new(|| gdk::RGBA::new(36. / 255., 36. / 255., 36. / 255., 1.)); +const BACKGROUND_COLOR_DEFAULT: gdk::RGBA = gdk::RGBA::new(36. / 255., 36. / 255., 36. / 255., 1.); /// Background color if the default does not give enough contrast for /// transparent images `#e8e7e6` -static BACKGROUND_COLOR_ALTERNATE: Lazy = - Lazy::new(|| gdk::RGBA::new(232. / 255., 231. / 255., 230. / 255., 1.)); +const BACKGROUND_COLOR_ALTERNATE: gdk::RGBA = + gdk::RGBA::new(232. / 255., 231. / 255., 230. / 255., 1.); -static BACKGROUND_COLOR_DEFAULT_LIGHT_MODE: Lazy = - Lazy::new(|| gdk::RGBA::new(250. / 255., 250. / 255., 250. / 255., 1.)); -static BACKGROUND_COLOR_ALTERNATE_LIGHT_MODE: Lazy = - Lazy::new(|| gdk::RGBA::new(103. / 255., 101. / 255., 110. / 255., 1.)); +const BACKGROUND_COLOR_DEFAULT_LIGHT_MODE: gdk::RGBA = + gdk::RGBA::new(250. / 255., 250. / 255., 250. / 255., 1.); +const BACKGROUND_COLOR_ALTERNATE_LIGHT_MODE: gdk::RGBA = + gdk::RGBA::new(103. / 255., 101. / 255., 110. / 255., 1.); /// Consider 3.5:1 contrast and worse to be bad contrast for a pixel static BACKGROUND_GUESS_LOW_CONTRAST_RATIO: f32 = 3.5; diff --git a/src/widgets/image/background_color.rs b/src/widgets/image/background_color.rs index 1951778..c20900a 100644 --- a/src/widgets/image/background_color.rs +++ b/src/widgets/image/background_color.rs @@ -35,17 +35,17 @@ impl imp::LpImage { pub fn default_background_color() -> gdk::RGBA { if adw::StyleManager::default().is_dark() { - *BACKGROUND_COLOR_DEFAULT + BACKGROUND_COLOR_DEFAULT } else { - *BACKGROUND_COLOR_DEFAULT_LIGHT_MODE + BACKGROUND_COLOR_DEFAULT_LIGHT_MODE } } pub fn alternate_background_color() -> gdk::RGBA { if adw::StyleManager::default().is_dark() { - *BACKGROUND_COLOR_ALTERNATE + BACKGROUND_COLOR_ALTERNATE } else { - *BACKGROUND_COLOR_ALTERNATE_LIGHT_MODE + BACKGROUND_COLOR_ALTERNATE_LIGHT_MODE } }