Try factoring out the dropdown boilerplate

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

@@ -414,16 +414,15 @@ impl LayoutHolder for MenuBarMessageHandler {
 							action: MenuBarEntry::no_action(),
 							disabled: no_active_document || !has_selected_layers,
 							children: MenuBarEntryChildren(vec![{
-								let operations = BooleanOperation::list();
-								let icons = BooleanOperation::icons();
-								operations
-									.into_iter()
-									.zip(icons)
-									.map(move |(operation, icon)| MenuBarEntry {
-										label: operation.to_string(),
-										icon: Some(icon.into()),
+								let list = <BooleanOperation as graphene_core::registry::ChoiceTypeStatic>::list();
+								list.into_iter()
+									.map(|i| i.into_iter())
+									.flatten()
+									.map(move |(operation, info)| MenuBarEntry {
+										label: info.label.to_string(),
+										icon: info.icon.as_ref().map(|i| i.to_string()),
 										action: MenuBarEntry::create_action(move |_| {
-											let group_folder_type = GroupFolderType::BooleanOperation(operation);
+											let group_folder_type = GroupFolderType::BooleanOperation(*operation);
 											DocumentMessage::GroupSelectedLayers { group_folder_type }.into()
 										}),
 										disabled: no_active_document || !has_selected_layers,

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

@@ -181,14 +181,18 @@ impl SelectTool {
 	}
 
 	fn boolean_widgets(&self, selected_count: usize) -> impl Iterator<Item = WidgetHolder> + use<> {
-		let operations = BooleanOperation::list();
-		let icons = BooleanOperation::icons();
-		operations.into_iter().zip(icons).map(move |(operation, icon)| {
-			IconButton::new(icon, 24)
-				.tooltip(operation.to_string())
+		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() {
+				tooltip.push_str("\n\n");
+				tooltip.push_str(doc);
+			}
+			IconButton::new(info.icon.as_deref().unwrap(), 24)
+				.tooltip(tooltip)
 				.disabled(selected_count == 0)
 				.on_update(move |_| {
-					let group_folder_type = GroupFolderType::BooleanOperation(operation);
+					let group_folder_type = GroupFolderType::BooleanOperation(*operation);
 					DocumentMessage::GroupSelectedLayers { group_folder_type }.into()
 				})
 				.widget_holder()

node-graph/gcore/src/animation.rs

@@ -2,9 +2,11 @@ use crate::{Ctx, ExtractAnimationTime, ExtractTime};
 
 const DAY: f64 = 1000. * 3600. * 24.;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, dyn_any::DynAny, Default, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, dyn_any::DynAny, Default, Hash, node_macro::ChoiceType)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+/// Real Time Mode
 pub enum RealTimeMode {
+	#[label("UTC")]
 	Utc,
 	Year,
 	Hour,
@@ -13,18 +15,6 @@ pub enum RealTimeMode {
 	Second,
 	Millisecond,
 }
-impl core::fmt::Display for RealTimeMode {
-	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-		match self {
-			RealTimeMode::Utc => write!(f, "UTC"),
-			RealTimeMode::Year => write!(f, "Year"),
-			RealTimeMode::Hour => write!(f, "Hour"),
-			RealTimeMode::Minute => write!(f, "Minute"),
-			RealTimeMode::Second => write!(f, "Second"),
-			RealTimeMode::Millisecond => write!(f, "Millisecond"),
-		}
-	}
-}
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum AnimationTimeMode {

node-graph/gcore/src/ops.rs

@@ -527,20 +527,14 @@ fn extract_xy<T: Into<DVec2>>(_: impl Ctx, #[implementations(DVec2, IVec2, UVec2
 
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "std", derive(specta::Type))]
-#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Hash, DynAny)]
+#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Hash, DynAny, node_macro::ChoiceType)]
+#[widget(Dropdown)]
+/// X or Y Component of Vector2
 pub enum XY {
 	#[default]
 	X,
 	Y,
 }
-impl core::fmt::Display for XY {
-	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-		match self {
-			XY::X => write!(f, "X"),
-			XY::Y => write!(f, "Y"),
-		}
-	}
-}
 
 // TODO: Rename to "Passthrough"
 /// Passes-through the input value without changing it. This is useful for rerouting wires for organization purposes.