Add new icons to all menu bar entries

editor/src/messages/layout/layout_message_handler.rs

@@ -201,10 +201,18 @@ impl LayoutMessageHandler {
 					WidgetValueAction::Commit => (icon_button.on_commit.callback)(&()),
 					WidgetValueAction::Update => (icon_button.on_update.callback)(icon_button),
 				};
+
+				responses.add(callback_message);
+			}
+			Widget::ImageButton(image_label) => {
+				let callback_message = match action {
+					WidgetValueAction::Commit => (image_label.on_commit.callback)(&()),
+					WidgetValueAction::Update => (image_label.on_update.callback)(&()),
+				};
+
 				responses.add(callback_message);
 			}
 			Widget::IconLabel(_) => {}
-			Widget::ImageLabel(_) => {}
 			Widget::InvisibleStandinInput(invisible) => {
 				let callback_message = match action {
 					WidgetValueAction::Commit => (invisible.on_commit.callback)(&()),

editor/src/messages/layout/utility_types/layout_widget.rs

@@ -333,7 +333,7 @@ impl LayoutGroup {
 				Widget::FontInput(x) => &mut x.tooltip,
 				Widget::IconButton(x) => &mut x.tooltip,
 				Widget::IconLabel(x) => &mut x.tooltip,
-				Widget::ImageLabel(x) => &mut x.tooltip,
+				Widget::ImageButton(x) => &mut x.tooltip,
 				Widget::NumberInput(x) => &mut x.tooltip,
 				Widget::ParameterExposeButton(x) => &mut x.tooltip,
 				Widget::PopoverButton(x) => &mut x.tooltip,
@@ -504,7 +504,7 @@ pub enum Widget {
 	FontInput(FontInput),
 	IconButton(IconButton),
 	IconLabel(IconLabel),
-	ImageLabel(ImageLabel),
+	ImageButton(ImageButton),
 	InvisibleStandinInput(InvisibleStandinInput),
 	NodeCatalog(NodeCatalog),
 	NumberInput(NumberInput),
@@ -579,8 +579,8 @@ impl DiffUpdate {
 				Widget::ParameterExposeButton(widget) => Some((&mut widget.tooltip, &mut widget.tooltip_shortcut)),
 				Widget::PopoverButton(widget) => Some((&mut widget.tooltip, &mut widget.tooltip_shortcut)),
 				Widget::TextButton(widget) => Some((&mut widget.tooltip, &mut widget.tooltip_shortcut)),
+				Widget::ImageButton(widget) => Some((&mut widget.tooltip, &mut widget.tooltip_shortcut)),
 				Widget::IconLabel(_)
-				| Widget::ImageLabel(_)
 				| Widget::CurveInput(_)
 				| Widget::InvisibleStandinInput(_)
 				| Widget::NodeCatalog(_)

editor/src/messages/layout/utility_types/widgets/button_widgets.rs

@@ -1,6 +1,7 @@
 use crate::messages::input_mapper::utility_types::misc::ActionKeys;
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::node_graph::utility_types::FrontendGraphDataType;
+use crate::messages::tool::tool_messages::tool_prelude::WidgetCallback;
 
 use graphene_std::vector::style::FillChoice;
 use graphite_proc_macros::WidgetBuilder;
@@ -120,6 +121,31 @@ pub struct TextButton {
 	pub on_commit: WidgetCallback<()>,
 }
 
+#[derive(Clone, serde::Serialize, serde::Deserialize, Derivative, Default, WidgetBuilder, specta::Type)]
+#[derivative(Debug, PartialEq)]
+pub struct ImageButton {
+	#[widget_builder(constructor)]
+	pub image: String,
+
+	pub width: Option<String>,
+
+	pub height: Option<String>,
+
+	pub tooltip: String,
+
+	#[serde(skip)]
+	pub tooltip_shortcut: Option<ActionKeys>,
+
+	// Callbacks
+	#[serde(skip)]
+	#[derivative(Debug = "ignore", PartialEq = "ignore")]
+	pub on_update: WidgetCallback<()>,
+
+	#[serde(skip)]
+	#[derivative(Debug = "ignore", PartialEq = "ignore")]
+	pub on_commit: WidgetCallback<()>,
+}
+
 #[derive(Clone, Derivative, serde::Serialize, serde::Deserialize, WidgetBuilder, specta::Type)]
 #[derivative(Debug, PartialEq, Default)]
 pub struct ColorButton {

editor/src/messages/layout/utility_types/widgets/label_widgets.rs

@@ -11,18 +11,6 @@ pub struct IconLabel {
 	pub tooltip: String,
 }
 
-#[derive(Clone, serde::Serialize, serde::Deserialize, Derivative, Debug, Default, PartialEq, Eq, WidgetBuilder, specta::Type)]
-pub struct ImageLabel {
-	#[widget_builder(constructor)]
-	pub image: String,
-
-	pub width: Option<String>,
-
-	pub height: Option<String>,
-
-	pub tooltip: String,
-}
-
 #[derive(Debug, Clone, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize, WidgetBuilder, specta::Type)]
 pub struct Separator {
 	pub direction: SeparatorDirection,
@@ -55,6 +43,9 @@ pub struct TextLabel {
 
 	pub italic: bool,
 
+	#[serde(rename = "centerAlign")]
+	pub center_align: bool,
+
 	#[serde(rename = "tableAlign")]
 	pub table_align: bool,