Move the new traits to a better place.

Author: kythyria

editor/src/messages/portfolio/document/node_graph/node_properties.rs

@@ -16,7 +16,7 @@ use graphene_core::raster::{
 	BlendMode, CellularDistanceFunction, CellularReturnType, Color, DomainWarpType, FractalType, LuminanceCalculation, NoiseType, RedGreenBlue, RedGreenBlueAlpha, RelativeAbsolute,
 	SelectiveColorChoice,
 };
-use graphene_core::registry::VariantMetadata;
+use graphene_core::registry::{ChoiceTypeStatic, ChoiceWidgetHint, VariantMetadata};
 use graphene_core::text::Font;
 use graphene_core::vector::misc::CentroidType;
 use graphene_core::vector::style::{GradientType, LineCap, LineJoin};
@@ -95,13 +95,13 @@ trait ChoiceSource {
 	fn into_tagged_value(v: Self::Value) -> TaggedValue;
 	fn from_tagged_value(tv: Option<&TaggedValue>) -> Option<Self::Value>;
 	fn enumerate() -> impl Iterator<Item = impl Iterator<Item = &'static (Self::Value, VariantMetadata)>>;
-	fn widget_hint() -> graphene_core::vector::misc::ChoiceWidgetHint;
+	fn widget_hint() -> ChoiceWidgetHint;
 }
 
-struct ChoiceSourceStatic<T: graphene_core::vector::misc::ChoiceTypeStatic>(std::marker::PhantomData<T>);
+struct ChoiceSourceStatic<T: ChoiceTypeStatic>(std::marker::PhantomData<T>);
 impl<T> ChoiceSource for ChoiceSourceStatic<T>
 where
-	T: graphene_core::vector::misc::ChoiceTypeStatic + 'static,
+	T: ChoiceTypeStatic + 'static,
 	for<'a> &'a T: TryFrom<&'a TaggedValue>,
 	TaggedValue: From<T>,
 {
@@ -120,12 +120,12 @@ where
 	fn enumerate() -> impl Iterator<Item = impl Iterator<Item = &'static (Self::Value, VariantMetadata)>> {
 		T::list().into_iter().map(|i| i.into_iter())
 	}
-	fn widget_hint() -> graphene_core::vector::misc::ChoiceWidgetHint {
+	fn widget_hint() -> ChoiceWidgetHint {
 		T::WIDGET_HINT
 	}
 }
 
-fn enum_source<E: graphene_core::vector::misc::ChoiceTypeStatic>() -> ChoiceSourceStatic<E> {
+fn enum_source<E: ChoiceTypeStatic>() -> ChoiceSourceStatic<E> {
 	ChoiceSourceStatic(std::marker::PhantomData)
 }
 
@@ -139,8 +139,8 @@ fn choice_widget<E: ChoiceSource>(list: E, document_node: &DocumentNode, node_id
 
 	if let Some(current) = E::from_tagged_value(input.as_non_exposed_value()) {
 		let widget = match E::widget_hint() {
-			graphene_std::vector::misc::ChoiceWidgetHint::Dropdown => dropdown(list, node_id, index, current),
-			graphene_std::vector::misc::ChoiceWidgetHint::RadioButtons => radio_buttons(list, node_id, index, current),
+			ChoiceWidgetHint::Dropdown => dropdown(list, node_id, index, current),
+			ChoiceWidgetHint::RadioButtons => radio_buttons(list, node_id, index, current),
 		};
 		widgets.extend_from_slice(&[Separator::new(SeparatorType::Unrelated).widget_holder(), widget]);
 	}

editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs

@@ -414,7 +414,7 @@ impl LayoutHolder for MenuBarMessageHandler {
 							action: MenuBarEntry::no_action(),
 							disabled: no_active_document || !has_selected_layers,
 							children: MenuBarEntryChildren(vec![{
-								let list = <BooleanOperation as graphene_core::vector::misc::ChoiceTypeStatic>::list();
+								let list = <BooleanOperation as graphene_core::registry::ChoiceTypeStatic>::list();
 								list.into_iter()
 									.map(|i| i.into_iter())
 									.flatten()

editor/src/messages/tool/tool_messages/select_tool.rs

@@ -180,7 +180,7 @@ impl SelectTool {
 	}
 
 	fn boolean_widgets(&self, selected_count: usize) -> impl Iterator<Item = WidgetHolder> + use<> {
-		let list = <BooleanOperation as graphene_core::vector::misc::ChoiceTypeStatic>::list();
+		let list = <BooleanOperation as graphene_core::registry::ChoiceTypeStatic>::list();
 		list.into_iter().map(|i| i.into_iter()).flatten().map(move |(operation, info)| {
 			let mut tooltip = info.label.to_string();
 			if let Some(doc) = info.docstring.as_deref() {

node-graph/gcore/src/registry.rs

@@ -52,6 +52,16 @@ pub struct FieldMetadata {
 	pub number_mode_range: Option<(f64, f64)>,
 }
 
+pub trait ChoiceTypeStatic: Sized + Copy + crate::vector::misc::AsU32 + std::fmt::Display + std::fmt::Debug + Send + Sync {
+	const WIDGET_HINT: ChoiceWidgetHint;
+	fn list() -> &'static [&'static [(Self, VariantMetadata)]];
+}
+
+pub enum ChoiceWidgetHint {
+	Dropdown,
+	RadioButtons,
+}
+
 // Translation struct between macro and definition
 #[derive(Clone, Debug)]
 pub struct VariantMetadata {

node-graph/gcore/src/vector/misc.rs

@@ -31,16 +31,6 @@ pub enum BooleanOperation {
 	Difference,
 }
 
-pub trait ChoiceTypeStatic: Sized + Copy + AsU32 + std::fmt::Display + std::fmt::Debug + Send + Sync {
-	const WIDGET_HINT: ChoiceWidgetHint;
-	fn list() -> &'static [&'static [(Self, crate::registry::VariantMetadata)]];
-}
-
-pub enum ChoiceWidgetHint {
-	Dropdown,
-	RadioButtons,
-}
-
 pub trait AsU32 {
 	fn as_u32(&self) -> u32;
 }

node-graph/node-macro/src/derive_choice_type.rs

@@ -165,8 +165,8 @@ fn derive_enum(enum_attrs: &[Attribute], name: Ident, input: syn::DataEnum) -> s
 			}
 		}
 
-		impl #crate_name::vector::misc::ChoiceTypeStatic for #name {
-			const WIDGET_HINT: #crate_name::vector::misc::ChoiceWidgetHint = #crate_name::vector::misc::ChoiceWidgetHint::#widget_hint;
+		impl #crate_name::registry::ChoiceTypeStatic for #name {
+			const WIDGET_HINT: #crate_name::registry::ChoiceWidgetHint = #crate_name::registry::ChoiceWidgetHint::#widget_hint;
 			fn list() -> &'static [&'static [(Self, #crate_name::registry::VariantMetadata)]] {
 				&[ #(#group)* ]
 			}