Fix for shared inherited styles not being overridden by inline styles

robbert-vdh · Apr 19, 2022 · 001c20b · 001c20b
1 parent 8b62269
commit 001c20b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/core/src/storage/animatable_set.rs b/core/src/storage/animatable_set.rs
@@ -242,11 +242,13 @@ where
                         return true;
                     }
                 } else {
-                    self.inline_data.sparse[entity_index] = InlineIndex {
-                        data_index: DataIndex::shared(parent_sparse_index.data_index.index())
-                            .inherited(),
-                        anim_index: std::u32::MAX,
-                    };
+                    if !entity_sparse_index.data_index.is_inline() {
+                        self.inline_data.sparse[entity_index] = InlineIndex {
+                            data_index: DataIndex::shared(parent_sparse_index.data_index.index())
+                                .inherited(),
+                            anim_index: std::u32::MAX,
+                        };
+                    }
                     return true;
                 }
             }

diff --git a/core/src/storage/style_set.rs b/core/src/storage/style_set.rs
@@ -207,11 +207,13 @@ where
                         return true;
                     }
                 } else {
-                    self.inline_data.sparse[entity_index] = Index {
-                        data_index: DataIndex::shared(parent_sparse_index.data_index.index())
-                            .inherited(),
-                        anim_index: std::u32::MAX,
-                    };
+                    if !entity_sparse_index.data_index.is_inline() {
+                        self.inline_data.sparse[entity_index] = Index {
+                            data_index: DataIndex::shared(parent_sparse_index.data_index.index())
+                                .inherited(),
+                            anim_index: std::u32::MAX,
+                        };
+                    }
                     return true;
                 }
             }