chore: small cleanup

ten3roberts · Jan 26, 2025 · 3c59493 · 3c59493
1 parent 0e02770
commit 3c59493
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 30 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -38,7 +38,7 @@ jobs:
           uses: actions-rs/cargo@v1
           with:
             command: nextest
-            args: run --all-features
+            args: run --workspace --all-features
 
   test_miri:
       runs-on: ubuntu-latest
@@ -59,7 +59,7 @@ jobs:
           uses: actions-rs/cargo@v1
           with:
             command: miri
-            args: nextest run
+            args: nextest run --workspace
 
 
   clippy:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/counter.rs b/examples/counter.rs
@@ -51,7 +51,7 @@ impl Widget for MainApp {
                     .signal()
                     .map(|v| Text::new(format!("Count: {v:>4}"))),
             )),
-            Button::new(Text::new("Increment")).on_press(move |_, _| *counter.lock_mut() += 1),
+            Button::new(Text::new("Increment")).on_click(move |_| *counter.lock_mut() += 1),
             pill(Text::new(
                 "Please click the button to increment the counter",
             )),

diff --git a/examples/wrapping.rs b/examples/wrapping.rs
@@ -3,7 +3,7 @@ use tracing_tree::HierarchicalLayer;
 use violet_core::{
     style::{base_colors::EMERALD_400, spacing_medium, surface_primary, SizeExt},
     unit::Unit,
-    widget::{col, row, Rectangle, Stack, Text},
+    widget::{col, row, Rectangle},
     Widget,
 };
 use violet_wgpu::renderer::MainRendererConfig;

diff --git a/violet-core/src/assets/handle.rs b/violet-core/src/assets/handle.rs
@@ -73,6 +73,12 @@ impl<T: ?Sized> std::ops::Deref for Asset<T> {
     }
 }
 
+impl AsRef<[u8]> for Asset<Vec<u8>> {
+    fn as_ref(&self) -> &[u8] {
+        self
+    }
+}
+
 impl<T: ?Sized> Clone for Asset<T> {
     fn clone(&self) -> Self {
         Self {

diff --git a/violet-core/src/style/color.rs b/violet-core/src/style/color.rs
@@ -151,12 +151,12 @@ impl ColorPalette {
             element_disabled_success: PLATINUM_950,
             element_disabled_warning: PLATINUM_950,
             //
-            surface_success: EMERALD_400,
-            surface_warning: CITRUS_400,
-            surface_danger: RUBY_400,
-            element_success: EMERALD_950,
-            element_warning: CITRUS_950,
-            element_danger: RUBY_950,
+            surface_success: EMERALD_500,
+            surface_warning: CITRUS_500,
+            surface_danger: RUBY_500,
+            element_success: element_primary,
+            element_warning: element_primary,
+            element_danger: element_primary,
         }
     }
 }

diff --git a/violet-core/src/systems.rs b/violet-core/src/systems.rs
@@ -5,7 +5,7 @@ use std::{
 
 use atomic_refcell::AtomicRefCell;
 use flax::{
-    archetype::Storage,
+    archetype::ArchetypeStorage,
     component::ComponentValue,
     components::child_of,
     entity_ids,
@@ -135,7 +135,7 @@ impl QueryInvalidator {
 }
 
 impl EventSubscriber for QueryInvalidator {
-    fn on_added(&self, _: &Storage, event: &EventData) {
+    fn on_added(&self, _: &ArchetypeStorage, event: &EventData) {
         // tracing::info!(component = ?self.name_map[&event.key], ?event.ids, "added");
         self.mark_dirty(event.ids);
     }
@@ -145,7 +145,7 @@ impl EventSubscriber for QueryInvalidator {
         self.mark_dirty(event.ids);
     }
 
-    fn on_removed(&self, _: &Storage, event: &EventData) {
+    fn on_removed(&self, _: &ArchetypeStorage, event: &EventData) {
         // tracing::info!(component = ?self.name_map[&event.key], ?event.ids, "removed");
         self.mark_dirty(event.ids);
     }

diff --git a/violet-demo/src/colorpicker.rs b/violet-demo/src/colorpicker.rs
@@ -154,7 +154,7 @@ fn palette_controls(
 
     let add_swatch = Button::label("+").on_press({
         to_owned!(palettes, selection);
-        move |_, _| {
+        move |_| {
             palettes.write_mut(|palette| {
                 let last = palette.colors.last().map(|v| v.get()).unwrap_or_default();
                 palette.colors.push(Mutable::new(last));
@@ -216,7 +216,7 @@ fn palette_controls(
                         Button::label("-")
                             .with_padding(spacing_small())
                             .with_margin(spacing_small())
-                            .on_press(move |_, _| {
+                            .on_press(move |_| {
                                 palettes.write_mut(|v| v.colors.remove(i));
                             }),
                     ))

diff --git a/violet-demo/src/lib.rs b/violet-demo/src/lib.rs
@@ -1,15 +1,4 @@
-use futures::StreamExt;
-use glam::Vec2;
-use violet::{
-    core::{
-        state::{State, StateStream},
-        style::{surface_accent, SizeExt},
-        widget::{col, row, Radio, StreamWidget, WidgetExt},
-        Widget,
-    },
-    futures_signals::signal::Mutable,
-    wgpu::{renderer::MainRendererConfig, AppBuilder},
-};
+use violet::wgpu::{renderer::MainRendererConfig, AppBuilder};
 use wasm_bindgen_futures::wasm_bindgen;
 
 pub mod bridge_of_death;

diff --git a/violet-wgpu/src/renderer/rect_renderer.rs b/violet-wgpu/src/renderer/rect_renderer.rs
@@ -11,7 +11,8 @@ use palette::Srgba;
 use violet_core::{
     assets::{map::HandleMap, Asset, AssetCache, AssetKey},
     components::{
-        anchor, color, widget_corner_radius, draw_shape, image, rect, screen_clip_mask, screen_transform,
+        anchor, color, draw_shape, image, rect, screen_clip_mask, screen_transform,
+        widget_corner_radius,
     },
     shape::{self, shape_rectangle},
     stored::{self, WeakHandle},