Switch to the widget builder pattern on all remaining layouts (#1346)

* Prefer widget builder pattern

* Nits

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>

editor/src/messages/dialog/simple_dialogs/about_graphite_dialog.rs

@@ -1,7 +1,5 @@
 use crate::application::{commit_info_localized, release_series};
-use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
-use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;
-use crate::messages::layout::utility_types::widgets::label_widgets::TextLabel;
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
 
 /// A dialog for displaying information on [BuildMetadata] viewable via *Help* > *About Graphite* in the menu bar.
@@ -19,34 +17,17 @@ impl PropertyHolder for AboutGraphiteDialog {
 		];
 		let link_widgets = links
 			.into_iter()
-			.map(|(label, url)| {
-				WidgetHolder::new(Widget::TextButton(TextButton {
-					label: label.to_string(),
-					on_update: WidgetCallback::new(|_| FrontendMessage::TriggerVisitLink { url: url.to_string() }.into()),
-					..Default::default()
-				}))
-			})
+			.map(|(label, url)| TextButton::new(label).on_update(|_| FrontendMessage::TriggerVisitLink { url: url.to_string() }.into()).widget_holder())
 			.collect();
 		Layout::WidgetLayout(WidgetLayout::new(vec![
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: "Graphite".to_string(),
-					bold: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new("Graphite".to_string()).bold(true).widget_holder()],
 			},
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: release_series(),
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new(release_series()).widget_holder()],
 			},
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: commit_info_localized(self.localized_commit_date.as_str()),
-					multiline: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new(commit_info_localized(&self.localized_commit_date)).multiline(true).widget_holder()],
 			},
 			LayoutGroup::Row { widgets: link_widgets },
 		]))

editor/src/messages/dialog/simple_dialogs/close_all_documents_dialog.rs

@@ -1,6 +1,4 @@
-use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
-use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;
-use crate::messages::layout::utility_types::widgets::label_widgets::TextLabel;
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
 
 /// A dialog for confirming the closing of all documents viewable via `file -> close all` in the menu bar.
@@ -8,42 +6,25 @@ pub struct CloseAllDocumentsDialog;
 
 impl PropertyHolder for CloseAllDocumentsDialog {
 	fn properties(&self) -> Layout {
-		let button_widgets = vec![
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Discard All".to_string(),
-				min_width: 96,
-				on_update: WidgetCallback::new(|_| {
-					DialogMessage::CloseDialogAndThen {
-						followups: vec![PortfolioMessage::CloseAllDocuments.into()],
-					}
-					.into()
-				}),
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Cancel".to_string(),
-				min_width: 96,
-				on_update: WidgetCallback::new(|_| FrontendMessage::DisplayDialogDismiss.into()),
-				..Default::default()
-			})),
-		];
+		let discard = TextButton::new("Discard All")
+			.min_width(96)
+			.on_update(|_| {
+				DialogMessage::CloseDialogAndThen {
+					followups: vec![PortfolioMessage::CloseAllDocuments.into()],
+				}
+				.into()
+			})
+			.widget_holder();
+		let cancel = TextButton::new("Cancel").min_width(96).on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_holder();
 
 		Layout::WidgetLayout(WidgetLayout::new(vec![
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: "Close all documents?".to_string(),
-					bold: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new("Close all documents?").multiline(true).widget_holder()],
 			},
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: "Unsaved work will be lost!".to_string(),
-					multiline: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new("Unsaved work will be lost!").multiline(true).widget_holder()],
 			},
-			LayoutGroup::Row { widgets: button_widgets },
+			LayoutGroup::Row { widgets: vec![discard, cancel] },
 		]))
 	}
 }

editor/src/messages/dialog/simple_dialogs/close_document_dialog.rs

@@ -1,7 +1,5 @@
 use crate::messages::broadcast::broadcast_event::BroadcastEvent;
-use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
-use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;
-use crate::messages::layout::utility_types::widgets::label_widgets::TextLabel;
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
 
 /// A dialog for confirming the closing a document with unsaved changes.
@@ -15,51 +13,34 @@ impl PropertyHolder for CloseDocumentDialog {
 		let document_id = self.document_id;
 
 		let button_widgets = vec![
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Save".to_string(),
-				min_width: 96,
-				emphasized: true,
-				on_update: WidgetCallback::new(|_| {
+			TextButton::new("Save")
+				.min_width(96)
+				.emphasized(true)
+				.on_update(|_| {
 					DialogMessage::CloseDialogAndThen {
 						followups: vec![DocumentMessage::SaveDocument.into()],
 					}
 					.into()
-				}),
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Discard".to_string(),
-				min_width: 96,
-				on_update: WidgetCallback::new(move |_| {
+				})
+				.widget_holder(),
+			TextButton::new("Discard")
+				.min_width(96)
+				.on_update(move |_| {
 					DialogMessage::CloseDialogAndThen {
 						followups: vec![BroadcastEvent::ToolAbort.into(), PortfolioMessage::CloseDocument { document_id }.into()],
 					}
 					.into()
-				}),
-				..Default::default()
-			})),
-			WidgetHolder::new(Widget::TextButton(TextButton {
-				label: "Cancel".to_string(),
-				min_width: 96,
-				on_update: WidgetCallback::new(|_| FrontendMessage::DisplayDialogDismiss.into()),
-				..Default::default()
-			})),
+				})
+				.widget_holder(),
+			TextButton::new("Cancel").min_width(96).on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_holder(),
 		];
 
 		Layout::WidgetLayout(WidgetLayout::new(vec![
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: "Save changes before closing?".to_string(),
-					bold: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new("Save changes before closing?").bold(true).widget_holder()],
 			},
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: self.document_name.clone(),
-					multiline: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new(&self.document_name).multiline(true).widget_holder()],
 			},
 			LayoutGroup::Row { widgets: button_widgets },
 		]))

editor/src/messages/dialog/simple_dialogs/coming_soon_dialog.rs

@@ -1,6 +1,4 @@
-use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
-use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;
-use crate::messages::layout::utility_types::widgets::label_widgets::TextLabel;
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
 
 use std::fmt::Write;
@@ -13,41 +11,33 @@ pub struct ComingSoonDialog {
 impl PropertyHolder for ComingSoonDialog {
 	fn properties(&self) -> Layout {
 		let mut details = "This feature is not implemented yet".to_string();
-		let mut buttons = vec![WidgetHolder::new(Widget::TextButton(TextButton {
-			label: "OK".to_string(),
-			emphasized: true,
-			min_width: 96,
-			on_update: WidgetCallback::new(|_| FrontendMessage::DisplayDialogDismiss.into()),
-			..Default::default()
-		}))];
+
+		let mut buttons = vec![TextButton::new("OK")
+			.emphasized(true)
+			.min_width(96)
+			.on_update(|_| FrontendMessage::DisplayDialogDismiss.into())
+			.widget_holder()];
+
 		if let Some(issue) = self.issue {
 			let _ = write!(details, "— but you can help add it!\nSee issue #{issue} on GitHub.");
-			buttons.push(WidgetHolder::new(Widget::TextButton(TextButton {
-				label: format!("Issue #{issue}"),
-				min_width: 96,
-				on_update: WidgetCallback::new(move |_| {
-					FrontendMessage::TriggerVisitLink {
-						url: format!("https://github.com/GraphiteEditor/Graphite/issues/{issue}"),
-					}
-					.into()
-				}),
-				..Default::default()
-			})));
+			buttons.push(
+				TextButton::new(format!("Issue #{issue}"))
+					.min_width(96)
+					.on_update(move |_| {
+						FrontendMessage::TriggerVisitLink {
+							url: format!("https://github.com/GraphiteEditor/Graphite/issues/{issue}"),
+						}
+						.into()
+					})
+					.widget_holder(),
+			);
 		}
 		Layout::WidgetLayout(WidgetLayout::new(vec![
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: "Coming soon".to_string(),
-					bold: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new("Coming soon").bold(true).widget_holder()],
 			},
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: details,
-					multiline: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new(details).multiline(true).widget_holder()],
 			},
 			LayoutGroup::Row { widgets: buttons },
 		]))

editor/src/messages/dialog/simple_dialogs/error_dialog.rs

@@ -1,6 +1,4 @@
-use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
-use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;
-use crate::messages::layout::utility_types::widgets::label_widgets::TextLabel;
+use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
 
 /// A dialog to notify users of a non-fatal error.
@@ -13,27 +11,17 @@ impl PropertyHolder for ErrorDialog {
 	fn properties(&self) -> Layout {
 		Layout::WidgetLayout(WidgetLayout::new(vec![
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: self.title.clone(),
-					bold: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new(&self.title).bold(true).widget_holder()],
 			},
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextLabel(TextLabel {
-					value: self.description.clone(),
-					multiline: true,
-					..Default::default()
-				}))],
+				widgets: vec![TextLabel::new(&self.description).multiline(true).widget_holder()],
 			},
 			LayoutGroup::Row {
-				widgets: vec![WidgetHolder::new(Widget::TextButton(TextButton {
-					label: "OK".to_string(),
-					emphasized: true,
-					min_width: 96,
-					on_update: WidgetCallback::new(|_| FrontendMessage::DisplayDialogDismiss.into()),
-					..Default::default()
-				}))],
+				widgets: vec![TextButton::new("OK")
+					.emphasized(true)
+					.min_width(96)
+					.on_update(|_| FrontendMessage::DisplayDialogDismiss.into())
+					.widget_holder()],
 			},
 		]))
 	}