Force ColorPickerFn to be Send + Sync (#3148) (#3233)

emilk · Aug 11, 2023 · ea6bdfc · ea6bdfc
1 parent 1e885ab
commit ea6bdfc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/crates/egui/src/grid.rs b/crates/egui/src/grid.rs
@@ -47,7 +47,7 @@ impl State {
 // ----------------------------------------------------------------------------
 
 // type alias for boxed function to determine row color during grid generation
-type ColorPickerFn = Box<dyn Fn(usize, &Style) -> Option<Color32>>;
+type ColorPickerFn = Box<dyn Send + Sync + Fn(usize, &Style) -> Option<Color32>>;
 
 pub(crate) struct GridLayout {
     ctx: Context,
@@ -312,7 +312,7 @@ impl Grid {
     /// Setting this will allow for dynamic coloring of rows of the grid object
     pub fn with_row_color<F>(mut self, color_picker: F) -> Self
     where
-        F: Fn(usize, &Style) -> Option<Color32> + 'static,
+        F: Send + Sync + Fn(usize, &Style) -> Option<Color32> + 'static,
     {
         self.color_picker = Some(Box::new(color_picker));
         self

diff --git a/crates/egui/src/ui.rs b/crates/egui/src/ui.rs
@@ -2245,3 +2245,9 @@ impl Ui {
         }
     }
 }
+
+#[test]
+fn ui_impl_send_sync() {
+    fn assert_send_sync<T: Send + Sync>() {}
+    assert_send_sync::<Ui>();
+}