From b35c7fc0ee8f433eb463a3d5872d7c4c6fd0db78 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Mon, 3 Feb 2025 19:53:09 -0800 Subject: [PATCH] theme: refactor dark theme logic to use is_oled This actually has no behavioral change, but is more logically correct if we ever end up updating these functions Signed-off-by: William Casarin --- crates/notedeck_chrome/src/setup.rs | 4 +++- crates/notedeck_chrome/src/theme.rs | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/crates/notedeck_chrome/src/setup.rs b/crates/notedeck_chrome/src/setup.rs index 3bd7ae78..43e4ba46 100644 --- a/crates/notedeck_chrome/src/setup.rs +++ b/crates/notedeck_chrome/src/setup.rs @@ -10,6 +10,8 @@ pub fn setup_chrome(ctx: &egui::Context, args: ¬edeck::Args, theme: ThemePref .is_mobile .unwrap_or(notedeck::ui::is_compiled_as_mobile()); + let is_oled = notedeck::ui::is_oled(); + // Some people have been running notedeck in debug, let's catch that! if !args.tests && cfg!(debug_assertions) && !args.debug { println!("--- WELCOME TO DAMUS NOTEDECK! ---"); @@ -24,7 +26,7 @@ pub fn setup_chrome(ctx: &egui::Context, args: ¬edeck::Args, theme: ThemePref info!("Loaded theme {:?} from disk", theme); o.theme_preference = theme; }); - ctx.set_visuals_of(egui::Theme::Dark, theme::dark_mode(is_mobile)); + ctx.set_visuals_of(egui::Theme::Dark, theme::dark_mode(is_oled)); ctx.set_visuals_of(egui::Theme::Light, theme::light_mode()); setup_cc(ctx, is_mobile); } diff --git a/crates/notedeck_chrome/src/theme.rs b/crates/notedeck_chrome/src/theme.rs index 87bb501f..56c38498 100644 --- a/crates/notedeck_chrome/src/theme.rs +++ b/crates/notedeck_chrome/src/theme.rs @@ -90,9 +90,9 @@ pub fn light_mode() -> Visuals { notedeck::theme::create_themed_visuals(light_color_theme(), Visuals::light()) } -pub fn dark_mode(mobile: bool) -> Visuals { +pub fn dark_mode(is_oled: bool) -> Visuals { notedeck::theme::create_themed_visuals( - if mobile { + if is_oled { mobile_dark_color_theme() } else { desktop_dark_color_theme()