mirror of
https://github.com/storytold/deckcraft.git
synced 2026-11-17 15:44:44 +00:00
color: DrawingML colours come from craft-drawingml (craft-libs#778, #792)
deckcraft-color re-exports craft_drawingml::color (Rgba, SchemeSlot, ColorScheme, ColorTransform, presets and transforms) and its own copy is deleted. The existing colour tests run unchanged against the shared module. ColorScheme literals use ColorScheme::new, since the shared scheme also keeps extra colours and tint rows.
This commit is contained in:
1 parent
3b6f9e7cb8
commit
dea0af6ceb
7 files changed
+36
-761
No files matched your search
@@ -69,7 +69,7 @@ impl Default for Theme {
|
||||
fn default() -> Self {
|
||||
builtin_themes().into_iter().next().unwrap_or_else(|| Theme {
|
||||
name: "DeckCraft".into(),
|
||||
colors: ColorScheme { name: "DeckCraft".into(), colors: [Rgba::BLACK; 12] },
|
||||
colors: ColorScheme::new("DeckCraft", [Rgba::BLACK; 12]),
|
||||
fonts: FontScheme::default(),
|
||||
format: FormatScheme::default(),
|
||||
raw_extra: None,
|
||||
@@ -97,7 +97,7 @@ fn hex(s: &str) -> Rgba {
|
||||
}
|
||||
|
||||
fn scheme(name: &str, c: [&str; 12]) -> ColorScheme {
|
||||
ColorScheme { name: name.into(), colors: c.map(hex) }
|
||||
ColorScheme::new(name, c.map(hex))
|
||||
}
|
||||
|
||||
fn ph() -> ColorRef {
|
||||
|
||||
Reference in new issue
Block a user