mirror of
https://github.com/storytold/deckcraft.git
synced 2026-11-20 17:14:49 +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
@@ -28,7 +28,7 @@ pub fn read_theme(imp: &mut Imp, part: &Part, root: &El) -> Theme {
|
||||
let mut t = Theme { name: root.attr("name").unwrap_or("Theme").to_string(), ..Default::default() };
|
||||
let Some(te) = root.child("themeElements") else { return t };
|
||||
if let Some(cs) = te.child("clrScheme") {
|
||||
let mut scheme = ColorScheme { name: cs.attr("name").unwrap_or("").to_string(), colors: t.colors.colors };
|
||||
let mut scheme = ColorScheme::new(cs.attr("name").unwrap_or("").to_string(), t.colors.colors);
|
||||
for slot in SchemeSlot::THEME {
|
||||
if let Some(c) = cs.child(slot.xml_name()).and_then(dml::color) {
|
||||
let rgb = match c.base {
|
||||
|
||||
Reference in new issue
Block a user