Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/theme_engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,19 @@ use crate::providers::{ProviderId, ProviderSet, PROVIDER_DESCRIPTORS};

pub const THEME_SCHEMA_VERSION: u32 = 1;
pub const CLASSIC_THEME_ID: &str = "classic-usage-widget";
pub const COMPACT_FLUENT_QUAD_THEME_ID: &str = "compact-fluent-quad";
pub const MINECRAFT_THEME_ID: &str = "theme-minecraft";

const BUILTIN_THEME_SOURCES: &[(&str, &str)] = &[(
CLASSIC_THEME_ID,
include_str!("themes/classic-usage-widget.json"),
)];
const BUILTIN_THEME_SOURCES: &[(&str, &str)] = &[
(
CLASSIC_THEME_ID,
include_str!("themes/classic-usage-widget.json"),
),
(
COMPACT_FLUENT_QUAD_THEME_ID,
include_str!("themes/compact-fluent-quad.json"),
),
];

/// Bundled starting points are copied into the managed library only when they
/// are missing. Their ids are deliberately excluded from `is_builtin_theme_id`
Expand Down
3 changes: 2 additions & 1 deletion src/theme_engine/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1244,8 +1244,9 @@ fn starter_tray_icons_follow_enabled_providers() {

#[test]
fn built_in_themes_are_valid_and_cannot_be_saved_as_editable_themes() {
assert_eq!(BUILTIN_THEME_SOURCES.len(), 1);
assert_eq!(BUILTIN_THEME_SOURCES.len(), 2);
assert_eq!(BUILTIN_THEME_SOURCES[0].0, CLASSIC_THEME_ID);
assert_eq!(BUILTIN_THEME_SOURCES[1].0, COMPACT_FLUENT_QUAD_THEME_ID);
assert!(REMOVED_BUILTIN_THEME_IDS
.iter()
.all(|id| !is_builtin_theme_id(id)));
Expand Down
Loading